summaryrefslogtreecommitdiffstats
path: root/smoketests/base.py
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-01-20 00:14:42 -0800
committerVishvananda Ishaya <vishvananda@gmail.com>2011-01-20 00:14:42 -0800
commit2f4258d99e8d97ec70645cd2df2f4e54dc869e89 (patch)
tree9de5b30b06dd61b0f8625ef22f4c43de7e4934ca /smoketests/base.py
parent9bd72f56224a8cc980620b17210d9b9b9ede6166 (diff)
downloadnova-2f4258d99e8d97ec70645cd2df2f4e54dc869e89.tar.gz
nova-2f4258d99e8d97ec70645cd2df2f4e54dc869e89.tar.xz
nova-2f4258d99e8d97ec70645cd2df2f4e54dc869e89.zip
more smoketest fixes
Diffstat (limited to 'smoketests/base.py')
-rw-r--r--smoketests/base.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/smoketests/base.py b/smoketests/base.py
index 610270c5c..89ee92840 100644
--- a/smoketests/base.py
+++ b/smoketests/base.py
@@ -17,12 +17,10 @@
# under the License.
import boto
-import boto_v6
import commands
import httplib
import os
import paramiko
-import random
import sys
import unittest
from boto.ec2.regioninfo import RegionInfo
@@ -30,6 +28,8 @@ from boto.ec2.regioninfo import RegionInfo
from smoketests import flags
FLAGS = flags.FLAGS
+boto_v6 = None
+
class SmokeTestCase(unittest.TestCase):
@@ -146,6 +146,9 @@ class SmokeTestCase(unittest.TestCase):
def run_tests(suites):
argv = FLAGS(sys.argv)
+ if FLAGS.use_ipv6:
+ global boto_v6
+ boto_v6 = __import__('boto_v6')
if not os.getenv('EC2_ACCESS_KEY'):
print >> sys.stderr, 'Missing EC2 environment variables. Please ' \