diff options
| author | Tushar Patil <tushar.vitthal.patil@gmail.com> | 2011-03-21 12:21:24 -0700 |
|---|---|---|
| committer | Tushar Patil <tushar.vitthal.patil@gmail.com> | 2011-03-21 12:21:24 -0700 |
| commit | 8f7d6b9da89e7154a79ad7d20681d0cb47e042b7 (patch) | |
| tree | a98abdacf381e66c856cf08928e0b01401dfeaa3 /smoketests | |
| parent | 5562c3f4b0a8e344cfd37dde19df7cb8d9fd03b2 (diff) | |
| download | nova-8f7d6b9da89e7154a79ad7d20681d0cb47e042b7.tar.gz nova-8f7d6b9da89e7154a79ad7d20681d0cb47e042b7.tar.xz nova-8f7d6b9da89e7154a79ad7d20681d0cb47e042b7.zip | |
Fix for LP Bug #739641
Diffstat (limited to 'smoketests')
| -rw-r--r-- | smoketests/base.py | 4 |
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): |