[dist] code cleanup in tests

openSUSE · Apr 15, 2016 · 734804d · 734804d
1 parent 02c89d0
commit 734804d
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 28 deletions.
diff --git a/dist/t/0060-check_required_services.ts b/dist/t/0060-check_required_services.ts
@@ -1,23 +1,11 @@
 #!/bin/bash
 
-export BOOTSTRAP_TEST_MODE=1
-export NON_INTERACTIVE=1
 export BASH_TAP_ROOT=$(dirname $0)
 
 . $(dirname $0)/bash-tap-bootstrap
 
 plan tests 16
 
-for i in $(dirname $0)/../setup-appliance.sh /usr/lib/obs/server/setup-appliance.sh;do
-	[[ -f $i && -z $SETUP_APPLIANCE ]] && SETUP_APPLIANCE=$i
-done
-
-if [[ -z $SETUP_APPLIANCE ]];then
-	BAIL_OUT "Could not find setup appliance"
-fi
-
-. $SETUP_APPLIANCE
-
 MAX_WAIT=300
 
 tmpcount=$MAX_WAIT

diff --git a/dist/t/0070-check_recommended_services.ts b/dist/t/0070-check_recommended_services.ts
@@ -1,23 +1,11 @@
 #!/bin/bash
 
-export BOOTSTRAP_TEST_MODE=1
-export NON_INTERACTIVE=1
 export BASH_TAP_ROOT=$(dirname $0)
 
 . $(dirname $0)/bash-tap-bootstrap
 
 plan tests 4
 
-for i in $(dirname $0)/../setup-appliance.sh /usr/lib/obs/server/setup-appliance.sh;do
-	[[ -f $i && -z $SETUP_APPLIANCE ]] && SETUP_APPLIANCE=$i
-done
-
-if [[ -z $SETUP_APPLIANCE ]];then
-	BAIL_OUT "Could not find setup appliance"
-fi
-
-. $SETUP_APPLIANCE
-
 MAX_WAIT=300
 
 tmpcount=$MAX_WAIT

diff --git a/dist/t/0080-check_ssl_certs.ts b/dist/t/0080-check_ssl_certs.ts
@@ -18,10 +18,6 @@ fi
 
 . $SETUP_APPLIANCE
 
-MAX_WAIT=300
-
-tmpcount=$MAX_WAIT
-
 get_hostname
 FQHN=$FQHOSTNAME