From: Radosław Korzeniewski <radekk@inteos.pl>
Date: Tue, 7 Jan 2020 11:42:21 +0000 (+0100)
Subject: regress: Update stats collector tests.
X-Git-Tag: Release-9.6.0~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a14119be6bab08cdbdefea2241924d7098f31b83;p=thirdparty%2Fbacula.git

regress: Update stats collector tests.
---

diff --git a/regress/scripts/collect-bacula-fd.conf.in b/regress/scripts/collect-bacula-fd.conf.in
index 4f70dd3f3..133db7e54 100644
--- a/regress/scripts/collect-bacula-fd.conf.in
+++ b/regress/scripts/collect-bacula-fd.conf.in
@@ -57,7 +57,7 @@ Statistics {
   Type = graphite
   Prefix = "backup"
   Host = localhost
-  Port = 9223
+  Port = 9224
   Metrics = "bacula.client.@hostname@-fd.memory.bufs"
 }
 
diff --git a/regress/scripts/collect-bacula-sd.conf.in b/regress/scripts/collect-bacula-sd.conf.in
index b2edd862f..1ad6d308d 100644
--- a/regress/scripts/collect-bacula-sd.conf.in
+++ b/regress/scripts/collect-bacula-sd.conf.in
@@ -154,7 +154,7 @@ Statistics {
   Type = graphite
   Prefix = "backup"
   Host = localhost
-  Port = 9223
+  Port = 9225
   Metrics = "bacula.storage.@hostname@-sd.config.devices"
 }
 
diff --git a/regress/tests/statistics-backend-test b/regress/tests/statistics-backend-test
index 76dca5b92..1b006162e 100755
--- a/regress/tests/statistics-backend-test
+++ b/regress/tests/statistics-backend-test
@@ -59,32 +59,8 @@ END_OF_DATA
 run_bconsole
 # start a Graphite simulator :)
 netcat -l -p 9223 -w 180 > ${cwd}/tmp/log7.out
-netcat -l -p 9223 -w 180 > ${cwd}/tmp/log8.out
-netcat -l -p 9223 -w 180 > ${cwd}/tmp/log9.out
-
-#cat <<END_OF_DATA >tmp/bconcmds
-#@# FD metrics
-#collect client all
-#@$out tmp/log3.out
-#@# SD metrics
-#collect storage all
-## now run some jobs
-#@$out tmp/log4.out
-#label storage=File1 volume=TestVolume001
-#run job=$JobName storage=File1 yes
-#wait
-#messages
-#@$out tmp/log5.out
-#@# Director metrics
-#collect all
-#@$out tmp/log6.out
-#@# FD metrics
-#collect client all
-#@$out tmp/log7.out
-#@# SD metrics
-#collect storage all
-#quit
-#END_OF_DATA
+netcat -l -p 9224 -w 180 > ${cwd}/tmp/log8.out
+netcat -l -p 9225 -w 180 > ${cwd}/tmp/log9.out
 
 check_for_zombie_jobs storage=File1
 stop_bacula