OpenStack Compute (nova)

Merge lp:~tpatil/nova/bug739641 into lp:~hudson-openstack/nova/trunk

  1. bug739641
  2. Merge into trunk
Proposed by Tushar Patil
Status: Merged
Approved by: Josh Kearney
Approved revision: 839
Merged at revision: 857
Proposed branch: lp:~tpatil/nova/bug739641
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 21 lines (+3/-1)
1 file modified
smoketests/base.py (+3/-1)
To merge this branch: bzr merge lp:~tpatil/nova/bug739641
Reviewer Review Type Date Requested Status
Josh Kearney (community) Approve
Vish Ishaya (community) Approve
Soren Hansen Pending
Review via email: mp+54256@code.launchpad.net

Description of the change

boto_v6 module is imported if the flag "use_ipv6" is set to True

To post a comment you must log in.
Revision history for this message
Vish Ishaya (vishvananda) wrote :

lgtm

review: Approve
Revision history for this message
Josh Kearney (jk0) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'smoketests/base.py'
2--- smoketests/base.py 2011-03-18 12:17:40 +0000
3+++ smoketests/base.py 2011-03-21 19:27:31 +0000
4@@ -32,7 +32,6 @@
5 FLAGS = flags.FLAGS
6 flags.DEFINE_string('suite', None, 'Specific test suite to run ' + SUITE_NAMES)
7 flags.DEFINE_integer('ssh_tries', 3, 'Numer of times to try ssh')
8-boto_v6 = None
9
10
11 class SmokeTestCase(unittest.TestCase):
12@@ -183,6 +182,9 @@
13
14
15 TEST_DATA = {}
16+if FLAGS.use_ipv6:
17+ global boto_v6
18+ boto_v6 = __import__('boto_v6')
19
20
21 class UserSmokeTestCase(SmokeTestCase):