From 8f7d6b9da89e7154a79ad7d20681d0cb47e042b7 Mon Sep 17 00:00:00 2001
From: Tushar Patil <tushar.vitthal.patil@gmail.com>
Date: Mon, 21 Mar 2011 12:21:24 -0700
Subject: Fix for LP Bug #739641

---
 smoketests/base.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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):
-- 
cgit