change the sampleDir setting in test cases (#196)

splunk · May 8, 2019 · 1d2ffb3 · 1d2ffb3
1 parent 1d2df70
commit 1d2ffb3
Show file tree

Hide file tree

Showing 28 changed files with 43 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,6 @@ _book
 venv/*
 *.log.*
 splunk_eventgen-*/
+.env
+.vscode
+
diff --git a/tests/perf/eventgen.conf.test1 b/tests/perf/eventgen.conf.test1
@@ -1,5 +1,5 @@
 [windbag]
-sampleDir = splunk_eventgen/samples
+sampleDir = ../../splunk_eventgen/samples
 generator = windbag
 outputMode = httpevent
 httpeventServers = {"servers":[{ "protocol":"https", "address":"<enter-ip-address>", "port":"<enter-port>", "key":"<enter-http-key>"}]}

diff --git a/tests/perf/eventgen.conf.test2 b/tests/perf/eventgen.conf.test2
@@ -1,5 +1,5 @@
 [windbag]
-sampleDir = splunk_eventgen/samples
+sampleDir = ../../splunk_eventgen/samples
 outputMode = httpevent
 httpeventServers = {"servers":[{ "protocol":"https", "address":"<enter-ip-address>", "port":"<enter-port>", "key":"<enter-http-key>"}]}
 index = eg

diff --git a/tests/perf/eventgen.conf.test3 b/tests/perf/eventgen.conf.test3
@@ -1,5 +1,5 @@
 [windbag-5-tokens]
-sampleDir = tests/perf/samples
+sampleDir = ./samples
 outputMode = httpevent
 httpeventServers = {"servers":[{ "protocol":"https", "address":"<enter-ip-address>", "port":"<enter-port>", "key":"<enter-http-key>"}]}
 index = eg

diff --git a/tests/sample_eventgen_conf/autotimestamp/eventgen.conf.autotimestamp b/tests/sample_eventgen_conf/autotimestamp/eventgen.conf.autotimestamp
@@ -1,5 +1,5 @@
 [replay]
-sampleDir = tests/sample_eventgen_conf/replay
+sampleDir = ../replay
 mode = sample
 timeMultiple = 2
 autotimestamp = true

diff --git a/tests/sample_eventgen_conf/backfill/eventgen.conf.backfillend b/tests/sample_eventgen_conf/backfill/eventgen.conf.backfillend
@@ -1,5 +1,5 @@
 [sample]
-sampleDir = tests/sample_eventgen_conf/sample
+sampleDir = ../sample
 outputMode = stdout
 count = 10
 earliest = now

diff --git a/tests/sample_eventgen_conf/backfill/eventgen.conf.backfillreplay b/tests/sample_eventgen_conf/backfill/eventgen.conf.backfillreplay
@@ -1,5 +1,5 @@
 [replay]
-sampleDir = tests/sample_eventgen_conf/replay
+sampleDir = ../replay
 generator = replay
 timeMultiple = 2
 backfill = -15m
@@ -17,4 +17,4 @@ splunkPass = changeme
 
 token.0.token = \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}
 token.0.replacementType = timestamp
-token.0.replacement = %Y-%m-%d %H:%M:%S
+token.0.replacement = %Y-%m-%d %H:%M:%S
diff --git a/tests/sample_eventgen_conf/backfill/eventgen.conf.backfillsample b/tests/sample_eventgen_conf/backfill/eventgen.conf.backfillsample
@@ -1,5 +1,5 @@
 [sample]
-sampleDir = tests/sample_eventgen_conf/sample
+sampleDir = ../sample
 outputMode = stdout
 count = 10
 earliest = now
@@ -11,4 +11,4 @@ end = 3
 
 token.0.token = \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}
 token.0.replacementType = timestamp
-token.0.replacement = %Y-%m-%d %H:%M:%S
+token.0.replacement = %Y-%m-%d %H:%M:%S
diff --git a/tests/sample_eventgen_conf/breakersample/eventgen.conf.breakersample b/tests/sample_eventgen_conf/breakersample/eventgen.conf.breakersample
@@ -1,5 +1,5 @@
 [breakersample]
-sampleDir = tests/sample_eventgen_conf/breakersample
+sampleDir = .
 outputMode = stdout
 count = 3
 earliest = -3s
@@ -10,4 +10,4 @@ end = 3
 
 token.0.token = ^(\d{14})\.\d{6}
 token.0.replacementType = timestamp
-token.0.replacement = %Y%m%d%H%M%S
+token.0.replacement = %Y%m%d%H%M%S
diff --git a/tests/sample_eventgen_conf/breakersample/eventgen.conf.randombreakersample b/tests/sample_eventgen_conf/breakersample/eventgen.conf.randombreakersample
@@ -1,5 +1,5 @@
 [breakersample]
-sampleDir = tests/sample_eventgen_conf/breakersample
+sampleDir = .
 outputMode = stdout
 count = 3
 earliest = -3s
@@ -11,4 +11,4 @@ end = 3
 
 token.0.token = ^(\d{14})\.\d{6}
 token.0.replacementType = timestamp
-token.0.replacement = %Y%m%d%H%M%S
+token.0.replacement = %Y%m%d%H%M%S
diff --git a/tests/sample_eventgen_conf/bundlelines/eventgen.conf.bundlelinescsv b/tests/sample_eventgen_conf/bundlelines/eventgen.conf.bundlelinescsv
@@ -1,5 +1,5 @@
 [csv]
-sampleDir = tests/sample_eventgen_conf/bundlelines
+sampleDir = .
 outputMode = stdout
 count = 3
 earliest = -3s
@@ -11,4 +11,4 @@ end = 3
 
 token.0.token = \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}
 token.0.replacementType = timestamp
-token.0.replacement = %Y-%m-%d %H:%M:%S
+token.0.replacement = %Y-%m-%d %H:%M:%S
diff --git a/tests/sample_eventgen_conf/bundlelines/eventgen.conf.bundlelinesraw b/tests/sample_eventgen_conf/bundlelines/eventgen.conf.bundlelinesraw
@@ -1,5 +1,5 @@
 [raw]
-sampleDir = tests/sample_eventgen_conf/bundlelines
+sampleDir = .
 outputMode = stdout
 count = 3
 earliest = -3s
@@ -10,4 +10,4 @@ end = 3
 
 token.0.token = \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}
 token.0.replacementType = timestamp
-token.0.replacement = %Y-%m-%d %H:%M:%S
+token.0.replacement = %Y-%m-%d %H:%M:%S
diff --git a/tests/sample_eventgen_conf/largerconfig/eventgen.conf.largerconfig b/tests/sample_eventgen_conf/largerconfig/eventgen.conf.largerconfig
@@ -8,7 +8,7 @@ outputMode = stdout
 end = 1
 
 [sample]
-sampleDir = tests/sample_eventgen_conf/sample
+sampleDir = ../sample
 outputMode = stdout
 count = 3
 earliest = -3s
@@ -21,7 +21,7 @@ token.0.replacementType = timestamp
 token.0.replacement = %s.%f
 
 [sample.mobilemusic.csv]
-sampleDir = tests/sample_eventgen_conf/replaytimestamp
+sampleDir = ../replaytimestamp
 outputMode = stdout
 sampletype = csv
 interval = 3
@@ -40,7 +40,7 @@ token.0.replacementType = replaytimestamp
 token.0.replacement = ["%b %d %H:%M:%S:%f", "%Y-%m-%d %H:%M:%S:%f"]
 
 [replay]
-sampleDir = tests/sample_eventgen_conf/replay
+sampleDir = ../replay
 generator = replay
 timeMultiple = 2
 end = 1
@@ -56,7 +56,7 @@ token.0.replacementType = timestamp
 token.0.replacement = %Y-%m-%d %H:%M:%S
 
 [csv]
-sampleDir = tests/sample_eventgen_conf/bundlelines
+sampleDir = ../bundlelines
 outputMode = stdout
 count = 3
 earliest = -3s
@@ -71,7 +71,7 @@ token.0.replacementType = timestamp
 token.0.replacement = %Y-%m-%d %H:%M:%S
 
 [breakersample]
-sampleDir = tests/sample_eventgen_conf/breakersample
+sampleDir = ../breakersample
 outputMode = stdout
 count = 3
 earliest = -3s

diff --git a/tests/sample_eventgen_conf/perdayvolume/eventgen.conf.perdayvolume b/tests/sample_eventgen_conf/perdayvolume/eventgen.conf.perdayvolume
@@ -1,5 +1,5 @@
 [perdayvolume]
-sampleDir = tests/sample_eventgen_conf/perdayvolume
+sampleDir = .
 perDayVolume = 1.1
 outputMode = stdout
 interval = 1

diff --git a/tests/sample_eventgen_conf/perdayvolume/eventgen.conf.perdayvolumesinglerun b/tests/sample_eventgen_conf/perdayvolume/eventgen.conf.perdayvolumesinglerun
@@ -1,5 +1,5 @@
 [perdayvolume]
-sampleDir = tests/sample_eventgen_conf/perdayvolume
+sampleDir = .
 end = 1
 interval=0
 perDayVolume = .01

diff --git a/tests/sample_eventgen_conf/perf/eventgen.conf.perfsample b/tests/sample_eventgen_conf/perf/eventgen.conf.perfsample
@@ -1,5 +1,5 @@
 [sample]
-sampleDir = tests/sample_eventgen_conf/sample
+sampleDir = ../sample
 outputMode = devnull
 count = 100000
 earliest = now

diff --git a/tests/sample_eventgen_conf/perf/eventgen.conf.perfsampleweblog b/tests/sample_eventgen_conf/perf/eventgen.conf.perfsampleweblog
@@ -1,5 +1,5 @@
 [sample.shoppingapacheBrowse]
-sampleDir = tests/sample_eventgen_conf/perf/weblog
+sampleDir = ./weblog
 mode = sample
 outputMode = devnull
 index = main

diff --git a/tests/sample_eventgen_conf/perf/eventgen.conf.perfsampleweblog-s2s b/tests/sample_eventgen_conf/perf/eventgen.conf.perfsampleweblog-s2s
@@ -1,5 +1,5 @@
 [sample.shoppingapacheBrowse]
-sampleDir = tests/sample_eventgen_conf/perf/weblog
+sampleDir = ./weblog
 mode = sample
 outputMode = s2s
 splunkHost = localhost

diff --git a/tests/sample_eventgen_conf/replay/eventgen.conf.badtimestamp b/tests/sample_eventgen_conf/replay/eventgen.conf.badtimestamp
@@ -1,5 +1,5 @@
 [badtimestamp]
-sampleDir = tests/sample_eventgen_conf/replay
+sampleDir = .
 generator = replay
 timeMultiple = 2
 

diff --git a/tests/sample_eventgen_conf/replay/eventgen.conf.replay b/tests/sample_eventgen_conf/replay/eventgen.conf.replay
@@ -1,5 +1,5 @@
 [replay]
-sampleDir = tests/sample_eventgen_conf/replay
+sampleDir = .
 backfill = -5s
 sampletype = raw
 outputMode = stdout

diff --git a/tests/sample_eventgen_conf/replay/eventgen.conf.timeorder b/tests/sample_eventgen_conf/replay/eventgen.conf.timeorder
@@ -1,5 +1,5 @@
 [timeorder]
-sampleDir = tests/sample_eventgen_conf/replay
+sampleDir = .
 generator = replay
 timeMultiple = 2
 sampletype = csv

diff --git a/tests/sample_eventgen_conf/replaytimestamp/eventgen.conf.replaytimestamp b/tests/sample_eventgen_conf/replaytimestamp/eventgen.conf.replaytimestamp
@@ -1,5 +1,5 @@
 [sample.mobilemusic.csv]
-sampleDir = tests/sample_eventgen_conf/replaytimestamp
+sampleDir = .
 outputMode = stdout
 sampletype = csv
 interval = 3

diff --git a/tests/sample_eventgen_conf/sample/eventgen.conf.epochtime b/tests/sample_eventgen_conf/sample/eventgen.conf.epochtime
@@ -1,5 +1,5 @@
 [sample]
-sampleDir = tests/sample_eventgen_conf/sample
+sampleDir = .
 outputMode = stdout
 count = 3
 earliest = -3s

diff --git a/tests/sample_eventgen_conf/sample/eventgen.conf.fullsample b/tests/sample_eventgen_conf/sample/eventgen.conf.fullsample
@@ -1,5 +1,5 @@
 [sample]
-sampleDir = tests/sample_eventgen_conf/sample
+sampleDir = .
 outputMode = stdout
 count = 0
 earliest = -3s
@@ -9,4 +9,4 @@ end = 5
 
 token.0.token = \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}
 token.0.replacementType = timestamp
-token.0.replacement = %Y-%m-%d %H:%M:%S
+token.0.replacement = %Y-%m-%d %H:%M:%S
diff --git a/tests/sample_eventgen_conf/sample/eventgen.conf.longsample b/tests/sample_eventgen_conf/sample/eventgen.conf.longsample
@@ -1,5 +1,5 @@
 [sample]
-sampleDir = tests/sample_eventgen_conf/sample
+sampleDir = .
 outputMode = stdout
 count = 10
 earliest = -3s

diff --git a/tests/sample_eventgen_conf/sample/eventgen.conf.randomsample b/tests/sample_eventgen_conf/sample/eventgen.conf.randomsample
@@ -1,5 +1,5 @@
 [sample]
-sampleDir = tests/sample_eventgen_conf/sample
+sampleDir = .
 outputMode = stdout
 count = 3
 earliest = -3s
@@ -10,4 +10,4 @@ end = 5
 
 token.0.token = \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}
 token.0.replacementType = timestamp
-token.0.replacement = %Y-%m-%d %H:%M:%S
+token.0.replacement = %Y-%m-%d %H:%M:%S
diff --git a/tests/sample_eventgen_conf/sample/eventgen.conf.shortsample b/tests/sample_eventgen_conf/sample/eventgen.conf.shortsample
@@ -1,5 +1,5 @@
 [sample]
-sampleDir = tests/sample_eventgen_conf/sample
+sampleDir = .
 outputMode = stdout
 count = 3
 earliest = -3s
@@ -9,4 +9,4 @@ end = 5
 
 token.0.token = \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}
 token.0.replacementType = timestamp
-token.0.replacement = %Y-%m-%d %H:%M:%S
+token.0.replacement = %Y-%m-%d %H:%M:%S
diff --git a/tests/sample_eventgen_conf/unit/eventgen.conf.config b/tests/sample_eventgen_conf/unit/eventgen.conf.config
@@ -1,5 +1,5 @@
 [sample]
-sampleDir = tests/sample_eventgen_conf/sample
+sampleDir = ../sample
 outputMode = splunkstream
 splunkMethod = https
 splunkHost = localhost
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,3 +27,6 @@ _book @@
     venv/*
     *.log.*
     splunk_eventgen-*/
+    .env
+    .vscode