summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTushar Patil <tushar.vitthal.patil@gmail.com>2011-03-24 01:51:34 +0000
committerTarmac <>2011-03-24 01:51:34 +0000
commit20d77ea69bde623cf50531647d9d20ffc7e4bc88 (patch)
tree0893f9053e8d6d76184eeba9de278c6fee59bdcb
parent0759158d08f3f98456ae094fd9d94d36b98216a5 (diff)
parent8f7d6b9da89e7154a79ad7d20681d0cb47e042b7 (diff)
downloadnova-20d77ea69bde623cf50531647d9d20ffc7e4bc88.tar.gz
nova-20d77ea69bde623cf50531647d9d20ffc7e4bc88.tar.xz
nova-20d77ea69bde623cf50531647d9d20ffc7e4bc88.zip
boto_v6 module is imported if the flag "use_ipv6" is set to True
-rw-r--r--smoketests/base.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/smoketests/base.py b/smoketests/base.py
index 3e2446c9a..31d82b20b 100644
--- a/smoketests/base.py
+++ b/smoketests/base.py
@@ -32,7 +32,6 @@ SUITE_NAMES = '[image, instance, volume]'
FLAGS = flags.FLAGS
flags.DEFINE_string('suite', None, 'Specific test suite to run ' + SUITE_NAMES)
flags.DEFINE_integer('ssh_tries', 3, 'Numer of times to try ssh')
-boto_v6 = None
class SmokeTestCase(unittest.TestCase):
@@ -183,6 +182,9 @@ class SmokeTestCase(unittest.TestCase):
TEST_DATA = {}
+if FLAGS.use_ipv6:
+ global boto_v6
+ boto_v6 = __import__('boto_v6')
class UserSmokeTestCase(SmokeTestCase):