Merge "Fix some import ordering HACKING violations"

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

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
 

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

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" ?>

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