diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-16 15:15:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-16 15:15:56 +0000 |
| commit | 057ca90347b2285c69c8b548710ab876ee1d634d (patch) | |
| tree | 3a210ffbced13c54a7e3f1f9675b404ced9dfbcb /tests/unit/rpc | |
| parent | 005ded7710edd9e18e9857469ee8d8fb8f0ad595 (diff) | |
| parent | 926b3e98d63e0a093ff90c0e215446a33fa69c95 (diff) | |
| download | oslo-057ca90347b2285c69c8b548710ab876ee1d634d.tar.gz oslo-057ca90347b2285c69c8b548710ab876ee1d634d.tar.xz oslo-057ca90347b2285c69c8b548710ab876ee1d634d.zip | |
Merge "Fixes import order nits"
Diffstat (limited to 'tests/unit/rpc')
| -rw-r--r-- | tests/unit/rpc/common.py | 2 | ||||
| -rw-r--r-- | tests/unit/rpc/test_common.py | 2 | ||||
| -rw-r--r-- | tests/unit/rpc/test_kombu.py | 2 | ||||
| -rw-r--r-- | tests/unit/rpc/test_proxy.py | 2 | ||||
| -rw-r--r-- | tests/unit/rpc/test_qpid.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/unit/rpc/common.py b/tests/unit/rpc/common.py index c4362b2..32f2a9b 100644 --- a/tests/unit/rpc/common.py +++ b/tests/unit/rpc/common.py @@ -19,9 +19,9 @@ Unit Tests for remote procedure calls shared between all implementations """ +import datetime import logging import time -import datetime import eventlet from oslo.config import cfg diff --git a/tests/unit/rpc/test_common.py b/tests/unit/rpc/test_common.py index 1f07ff7..73ca63b 100644 --- a/tests/unit/rpc/test_common.py +++ b/tests/unit/rpc/test_common.py @@ -20,8 +20,8 @@ Unit Tests for 'common' functons used through rpc code. import logging import sys -import six from oslo.config import cfg +import six from openstack.common import exception from openstack.common import importutils diff --git a/tests/unit/rpc/test_kombu.py b/tests/unit/rpc/test_kombu.py index 73ce2ce..ebc29ea 100644 --- a/tests/unit/rpc/test_kombu.py +++ b/tests/unit/rpc/test_kombu.py @@ -26,8 +26,8 @@ import contextlib import logging import mock -import six from oslo.config import cfg +import six from openstack.common import exception from openstack.common.rpc import amqp as rpc_amqp diff --git a/tests/unit/rpc/test_proxy.py b/tests/unit/rpc/test_proxy.py index db6e5fa..63360ba 100644 --- a/tests/unit/rpc/test_proxy.py +++ b/tests/unit/rpc/test_proxy.py @@ -25,8 +25,8 @@ import six from openstack.common import context from openstack.common import lockutils from openstack.common import rpc -from openstack.common.rpc import proxy from openstack.common.rpc import common as rpc_common +from openstack.common.rpc import proxy from tests import utils diff --git a/tests/unit/rpc/test_qpid.py b/tests/unit/rpc/test_qpid.py index 0ee05cf..82cc119 100644 --- a/tests/unit/rpc/test_qpid.py +++ b/tests/unit/rpc/test_qpid.py @@ -29,8 +29,8 @@ from oslo.config import cfg from openstack.common import context from openstack.common.rpc import amqp as rpc_amqp -from tests import utils from openstack.common.rpc import common as rpc_common +from tests import utils try: import qpid |