diff options
| author | Doug Hellmann <doug@doughellmann.com> | 2014-09-07 14:49:10 -0400 |
|---|---|---|
| committer | Doug Hellmann <doug@doughellmann.com> | 2014-09-13 09:59:48 -0400 |
| commit | 6b048e79e88122f09697d2b194cf266ef267bf9c (patch) | |
| tree | 6a02d0ac5bbf9d52490c658fb13731c951504070 | |
| parent | eb6e8824e5235316707b7ba81aea8037385b6114 (diff) | |
| download | oslo-incubator-6b048e79e88122f09697d2b194cf266ef267bf9c.tar.gz | |
Let oslotest manage the six.move setting for mox
This instruction to set up a move in six for the mox module conflicts
with the one in oslotest. We are trying to use mox3 everywhere, so
remove this instruction and let oslotest handle it.
This changeset modifies the tests for the old qpid RPC driver, which is
deprecated. However, we need to make the file importable for testr to
successfully run the tests that aren't deprecated, so we need that
change as well.
Change-Id: I59d5799283233f8411044ddb15c8abfc8850014c
| -rw-r--r-- | openstack/common/__init__.py | 17 | ||||
| -rw-r--r-- | tests/unit/rpc/test_qpid.py | 2 | ||||
| -rw-r--r-- | tests/unit/test_service.py | 2 |
3 files changed, 2 insertions, 19 deletions
diff --git a/openstack/common/__init__.py b/openstack/common/__init__.py index d1223eaf..e69de29b 100644 --- a/openstack/common/__init__.py +++ b/openstack/common/__init__.py @@ -1,17 +0,0 @@ -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import six - - -six.add_move(six.MovedModule('mox', 'mox', 'mox3.mox')) diff --git a/tests/unit/rpc/test_qpid.py b/tests/unit/rpc/test_qpid.py index 18b4fff7..e8160e54 100644 --- a/tests/unit/rpc/test_qpid.py +++ b/tests/unit/rpc/test_qpid.py @@ -27,8 +27,8 @@ import uuid import fixtures import mock -import mox from oslotest import moxstubout +from six.moves import mox from openstack.common import context from openstack.common.fixture import config diff --git a/tests/unit/test_service.py b/tests/unit/test_service.py index 9d569111..8d469cb2 100644 --- a/tests/unit/test_service.py +++ b/tests/unit/test_service.py @@ -31,9 +31,9 @@ import traceback import eventlet from eventlet import event import mock -import mox from oslotest import base as test_base from oslotest import moxstubout +from six.moves import mox from openstack.common import eventlet_backdoor from openstack.common.fixture import config |