systemtests: reload tests: use $BAREOS_DIRECTOR_BINARY instead of bar…

…eos-dir
bareos · Jan 15, 2020 · 05df370 · 05df370
1 parent df13c94
commit 05df370
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/systemtests/tests/reload-works-on-adding-client-resource/testrunner b/systemtests/tests/reload-works-on-adding-client-resource/testrunner
@@ -33,7 +33,7 @@ stop_director() {
 
 start_director() {
   "${scripts}/bareos-ctl-dir" start "$director_debug_level"
-  director_pid=$(pidof bareos-dir)
+  director_pid=$(pidof ${BAREOS_DIRECTOR_BINARY})
 
   if [ -z "$director_pid" ]; then
     exit_with_error "Bareos director could not be started"

diff --git a/systemtests/tests/reload-works-on-adding-duplicate-job-resource/testrunner b/systemtests/tests/reload-works-on-adding-duplicate-job-resource/testrunner
@@ -32,7 +32,7 @@ stop_director() {
 
 start_director() {
   "${scripts}/bareos-ctl-dir" start "$director_debug_level"
-  director_pid=$(pidof bareos-dir)
+  director_pid=$(pidof ${BAREOS_DIRECTOR_BINARY})
 
   if [ -z "$director_pid" ]; then
     exit_with_error "Bareos director could not be started"

diff --git a/systemtests/tests/reload-works-on-adding-empty-job-resource/testrunner b/systemtests/tests/reload-works-on-adding-empty-job-resource/testrunner
@@ -32,7 +32,7 @@ stop_director() {
 
 start_director() {
   "${scripts}/bareos-ctl-dir" start "$director_debug_level"
-  director_pid=$(pidof bareos-dir)
+  director_pid=$(pidof ${BAREOS_DIRECTOR_BINARY})
 
   if [ -z "$director_pid" ]; then
     exit_with_error "Bareos director could not be started"

diff --git a/systemtests/tests/reload-works-on-adding-second-director-resource/testrunner b/systemtests/tests/reload-works-on-adding-second-director-resource/testrunner
@@ -32,7 +32,7 @@ stop_director() {
 
 start_director() {
   "${scripts}/bareos-ctl-dir" start "$director_debug_level"
-  director_pid=$(pidof bareos-dir)
+  director_pid=$(pidof ${BAREOS_DIRECTOR_BINARY})
 
   if [ -z "$director_pid" ]; then
     exit_with_error "Bareos director could not be started"

diff --git a/systemtests/tests/reload-works-on-adding-uncommented-string/testrunner b/systemtests/tests/reload-works-on-adding-uncommented-string/testrunner
@@ -32,7 +32,7 @@ stop_director() {
 
 start_director() {
   "${scripts}/bareos-ctl-dir" start "$director_debug_level"
-  director_pid=$(pidof bareos-dir)
+  director_pid=$(pidof ${BAREOS_DIRECTOR_BINARY})
 
   if [ -z "$director_pid" ]; then
     exit_with_error "Bareos director could not be started"

diff --git a/systemtests/tests/reload-works-on-unchanged-config/testrunner b/systemtests/tests/reload-works-on-unchanged-config/testrunner
@@ -31,7 +31,7 @@ stop_director() {
 
 start_director() {
   "${scripts}/bareos-ctl-dir" start "$director_debug_level"
-  director_pid=$(pidof bareos-dir)
+  director_pid=$(pidof ${BAREOS_DIRECTOR_BINARY})
 
   if [ -z "$director_pid" ]; then
     exit_with_error "Bareos director could not be started"