diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-28 21:59:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-28 21:59:50 +0000 |
| commit | b38840fdbd6d8d9e7da46ba91b40d20048b3fa2d (patch) | |
| tree | a0f0d549a8124417b4d4a0987c30dd9c665d420e | |
| parent | 768937fc47ddb0e1752bb044df9f5fdc2b37506f (diff) | |
| parent | 17aad487fa9e4b5fd7cb3e6070cd745d370c5200 (diff) | |
| download | nova-b38840fdbd6d8d9e7da46ba91b40d20048b3fa2d.tar.gz nova-b38840fdbd6d8d9e7da46ba91b40d20048b3fa2d.tar.xz nova-b38840fdbd6d8d9e7da46ba91b40d20048b3fa2d.zip | |
Merge "Fix some import ordering HACKING violations"
| -rw-r--r-- | nova/tests/api/ec2/test_ec2_validate.py | 2 | ||||
| -rw-r--r-- | nova/tests/compute/test_compute.py | 2 | ||||
| -rw-r--r-- | nova/tests/image/test_fake.py | 2 | ||||
| -rw-r--r-- | nova/tests/image/test_s3.py | 2 | ||||
| -rw-r--r-- | nova/tests/test_notifications.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/nova/tests/api/ec2/test_ec2_validate.py b/nova/tests/api/ec2/test_ec2_validate.py index cd213dd09..f9c1d2be8 100644 --- a/nova/tests/api/ec2/test_ec2_validate.py +++ b/nova/tests/api/ec2/test_ec2_validate.py @@ -22,11 +22,11 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova.tests.image import fake from nova import log as logging from nova.openstack.common import importutils from nova.openstack.common import rpc from nova import test +from nova.tests.image import fake LOG = logging.getLogger(__name__) FLAGS = flags.FLAGS diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 9ae099b60..bf4a20cf3 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -39,7 +39,6 @@ from nova import context from nova import db from nova import exception from nova import flags -from nova.tests.image import fake as fake_image from nova import log as logging from nova.notifier import test_notifier from nova.openstack.common import importutils @@ -52,6 +51,7 @@ from nova import quota from nova.scheduler import driver as scheduler_driver from nova import test from nova.tests import fake_network +from nova.tests.image import fake as fake_image from nova import utils import nova.volume diff --git a/nova/tests/image/test_fake.py b/nova/tests/image/test_fake.py index bd7ae7d5b..ab7f043d2 100644 --- a/nova/tests/image/test_fake.py +++ b/nova/tests/image/test_fake.py @@ -20,8 +20,8 @@ import StringIO from nova import context from nova import exception -import nova.tests.image.fake from nova import test +import nova.tests.image.fake class FakeImageServiceTestCase(test.TestCase): diff --git a/nova/tests/image/test_s3.py b/nova/tests/image/test_s3.py index 9b4b5757f..27a47fc55 100644 --- a/nova/tests/image/test_s3.py +++ b/nova/tests/image/test_s3.py @@ -24,9 +24,9 @@ import tempfile from nova import context import nova.db.api from nova import exception -from nova.tests.image import fake from nova.image import s3 from nova import test +from nova.tests.image import fake ami_manifest_xml = """<?xml version="1.0" ?> diff --git a/nova/tests/test_notifications.py b/nova/tests/test_notifications.py index ff6acb155..0f44064da 100644 --- a/nova/tests/test_notifications.py +++ b/nova/tests/test_notifications.py @@ -26,8 +26,8 @@ from nova import context from nova import db from nova import flags from nova import log as logging -from nova import notifications import nova.network +from nova import notifications from nova.notifier import test_notifier from nova import test from nova.tests import fake_network |