systemtests: removed all killalls

bareos · Jan 15, 2020 · e544c58 · e544c58
1 parent d420756
commit e544c58
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 39 deletions.
diff --git a/systemtests/tests/backup-bareos-client-initiated-test/testrunner b/systemtests/tests/backup-bareos-client-initiated-test/testrunner
@@ -19,9 +19,6 @@ exit_with_error() {
 
 stop_bareos_daemons() {
   stop_bareos
-  if [ -n "$(pidof bareos-sd)" ]; then killall -SIGKILL bareos-sd >/dev/null 2>&1; fi
-  if [ -n "$(pidof bareos-fd)" ]; then killall -SIGKILL bareos-fd >/dev/null 2>&1; fi
-  if [ -n "$(pidof bareos-dir)" ]; then killall -SIGKILL bareos-dir >/dev/null 2>&1; fi
 }
 
 # Directory to backup.

diff --git a/systemtests/tests/reload-works-on-adding-client-resource/testrunner b/systemtests/tests/reload-works-on-adding-client-resource/testrunner
@@ -29,12 +29,6 @@ exit_with_error() {
 
 stop_director() {
   "${scripts}/bareos-ctl-dir" stop
-  if [ -n "$(pidof bareos-dir)" ]; then
-    killall -SIGKILL "$(pidof bareos-dir)"
-  fi
-  if [ -n "$(pidof bareos-dir)" ]; then
-    exit_with_error "Bareos director could not be stopped"
-  fi
 }
 
 start_director() {

diff --git a/systemtests/tests/reload-works-on-adding-duplicate-job-resource/testrunner b/systemtests/tests/reload-works-on-adding-duplicate-job-resource/testrunner
@@ -28,12 +28,6 @@ exit_with_error() {
 
 stop_director() {
   "${scripts}/bareos-ctl-dir" stop
-  if [ -n "$(pidof bareos-dir)" ]; then
-    killall -SIGKILL "$(pidof bareos-dir)"
-  fi
-  if [ -n "$(pidof bareos-dir)" ]; then
-    exit_with_error "Bareos director could not be stopped"
-  fi
 }
 
 start_director() {

diff --git a/systemtests/tests/reload-works-on-adding-empty-job-resource/testrunner b/systemtests/tests/reload-works-on-adding-empty-job-resource/testrunner
@@ -28,12 +28,6 @@ exit_with_error() {
 
 stop_director() {
   "${scripts}/bareos-ctl-dir" stop
-  if [ -n "$(pidof bareos-dir)" ]; then
-    killall -SIGKILL "$(pidof bareos-dir)"
-  fi
-  if [ -n "$(pidof bareos-dir)" ]; then
-    exit_with_error "Bareos director could not be stopped"
-  fi
 }
 
 start_director() {

diff --git a/systemtests/tests/reload-works-on-adding-second-director-resource/testrunner b/systemtests/tests/reload-works-on-adding-second-director-resource/testrunner
@@ -28,12 +28,6 @@ exit_with_error() {
 
 stop_director() {
   "${scripts}/bareos-ctl-dir" stop
-  if [ -n "$(pidof bareos-dir)" ]; then
-    killall -SIGKILL "$(pidof bareos-dir)"
-  fi
-  if [ -n "$(pidof bareos-dir)" ]; then
-    exit_with_error "Bareos director could not be stopped"
-  fi
 }
 
 start_director() {

diff --git a/systemtests/tests/reload-works-on-adding-uncommented-string/testrunner b/systemtests/tests/reload-works-on-adding-uncommented-string/testrunner
@@ -28,12 +28,6 @@ exit_with_error() {
 
 stop_director() {
   "${scripts}/bareos-ctl-dir" stop
-  if [ -n "$(pidof bareos-dir)" ]; then
-    killall -SIGKILL "$(pidof bareos-dir)"
-  fi
-  if [ -n "$(pidof bareos-dir)" ]; then
-    exit_with_error "Bareos director could not be stopped"
-  fi
 }
 
 start_director() {

diff --git a/systemtests/tests/reload-works-on-unchanged-config/testrunner b/systemtests/tests/reload-works-on-unchanged-config/testrunner
@@ -27,12 +27,6 @@ exit_with_error() {
 
 stop_director() {
   "${scripts}/bareos-ctl-dir" stop
-  if [ -n "$(pidof bareos-dir)" ]; then
-    killall -SIGKILL "$(pidof bareos-dir)"
-  fi
-  if [ -n "$(pidof bareos-dir)" ]; then
-    exit_with_error "Bareos director could not be stopped"
-  fi
 }
 
 start_director() {