diff options
| author | Joe Gordon <jogo@cloudscaling.com> | 2013-01-17 18:06:53 -0500 |
|---|---|---|
| committer | Joe Gordon <jogo@cloudscaling.com> | 2013-01-24 09:52:58 -0500 |
| commit | 4845fc2720a0ab3ff4f15fc8f3f00573b617ce5b (patch) | |
| tree | 4d8a01e2b9591c39eb3aa93b92be8c6e6df4783d /smoketests/base.py | |
| parent | 4220e0110e1e45a1886d8a8b186aa4cdc2ef9455 (diff) | |
| download | nova-4845fc2720a0ab3ff4f15fc8f3f00573b617ce5b.tar.gz nova-4845fc2720a0ab3ff4f15fc8f3f00573b617ce5b.tar.xz nova-4845fc2720a0ab3ff4f15fc8f3f00573b617ce5b.zip | |
Fix hacking N302 import only modules
* Includes some general tools/hacking cleanup
* Fix several N302 cases
* Disable N302 until all cases are fixed
Change-Id: Iddba07ff13e10dc41a6930749044bb8c0572d279
Diffstat (limited to 'smoketests/base.py')
| -rw-r--r-- | smoketests/base.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/smoketests/base.py b/smoketests/base.py index f6cec3168..7c7d19838 100644 --- a/smoketests/base.py +++ b/smoketests/base.py @@ -17,7 +17,7 @@ # under the License. import boto -from boto.ec2.regioninfo import RegionInfo +from boto.ec2 import regioninfo import commands import httplib import os @@ -123,7 +123,7 @@ class SmokeTestCase(unittest.TestCase): return boto_v6.connect_ec2(aws_access_key_id=access_key, aws_secret_access_key=secret_key, is_secure=parts['is_secure'], - region=RegionInfo(None, + region=regioninfo.RegionInfo(None, 'nova', parts['ip']), port=parts['port'], @@ -133,7 +133,7 @@ class SmokeTestCase(unittest.TestCase): return boto.connect_ec2(aws_access_key_id=access_key, aws_secret_access_key=secret_key, is_secure=parts['is_secure'], - region=RegionInfo(None, + region=regioninfo.RegionInfo(None, 'nova', parts['ip']), port=parts['port'], |