Permalink
Browse files

making the test timeout configurable

  • Loading branch information...
1 parent d771635 commit 3511c1271fc2c848f7434078eecd435aeeb949a4 @buzztroll buzztroll committed Jun 13, 2011
View
@@ -7,7 +7,7 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
logfile = sys.stdout
@@ -11,7 +11,7 @@
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
nh=os.environ['NIMBUS_HOME']
logfile = sys.stdout
@@ -10,7 +10,7 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
nh=os.environ['NIMBUS_HOME']
logfile = sys.stdout
@@ -5,7 +5,7 @@
import os
import uuid
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
View
@@ -6,7 +6,7 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
logfile = sys.stdout
@@ -7,7 +7,7 @@
import tempfile
import filecmp
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
nh=os.environ['NIMBUS_HOME']
logfile = sys.stdout
View
@@ -6,7 +6,7 @@
import filecmp
import uuid
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
View
@@ -8,7 +8,7 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
logfile = sys.stdout
newname=str(uuid.uuid1()).replace("-", "")
@@ -6,7 +6,7 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
logfile = sys.stdout
@@ -4,7 +4,7 @@
import sys
import os
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
logfile = sys.stdout
@@ -6,7 +6,7 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
logfile = sys.stdout
@@ -7,7 +7,7 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
nh=os.environ['NIMBUS_HOME']
logfile = sys.stdout
@@ -7,7 +7,7 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
nh=os.environ['NIMBUS_HOME']
logfile = sys.stdout
@@ -7,7 +7,7 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
nh=os.environ['NIMBUS_HOME']
logfile = sys.stdout
@@ -7,7 +7,7 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
nh=os.environ['NIMBUS_HOME']
logfile = sys.stdout
@@ -7,7 +7,7 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
nh=os.environ['NIMBUS_HOME']
logfile = sys.stdout
View
@@ -6,7 +6,7 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
logfile = sys.stdout
@@ -16,7 +16,7 @@
os.rename(s3cfg, bkname)
shutil.copyfile(s3cfguser, s3cfg)
try:
- to=90
+ int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
logfile = sys.stdout
newname=str(uuid.uuid1()).replace("-", "")
@@ -9,7 +9,7 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
logfile = sys.stdout
newname=str(uuid.uuid1()).replace("-", "")
@@ -9,7 +9,7 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
logfile = sys.stdout
newname=str(uuid.uuid1()).replace("-", "")
@@ -7,7 +7,7 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
logfile = sys.stdout
@@ -6,7 +6,7 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
logfile = sys.stdout
@@ -6,7 +6,7 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
logfile = sys.stdout
@@ -6,7 +6,7 @@
tst_image_name = os.environ['NIMBUS_TEST_IMAGE']
tst_image_src = os.environ['NIMBUS_SOURCE_TEST_IMAGE']
-to=90
+int(os.environ[NIMBUS_TEST_TIMEOUT])
cc_home=os.environ['CLOUD_CLIENT_HOME']
logfile = sys.stdout
View
@@ -302,4 +302,5 @@ echo "export NIMBUS_WORKSPACE_CONTROL_HOME=$NIMBUS_WORKSPACE_CONTROL_HOME" >> $s
echo "export NIMBUS_TEST_USER_CAN_ID=$can_id" >> $src_dir/env.sh
echo "export NIMBUS_TEST_IMAGE=group" >> $src_dir/env.sh
echo "export NIMBUS_SOURCE_TEST_IMAGE=/etc/group" >> $src_dir/env.sh
+echo "export NIMBUS_TEST_TIMEOUT=90" >> $src_dir/env.sh

0 comments on commit 3511c12

Please sign in to comment.