Browse Source

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.
Imported from the incubator change with the same ID.

Change-Id: I59d5799283233f8411044ddb15c8abfc8850014c
changes/57/119657/1
Doug Hellmann 7 years ago
parent
commit
41fbe410aa
  1. 17
      oslo/messaging/openstack/common/__init__.py
  2. 2
      tests/test_transport.py

17
oslo/messaging/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'))

2
tests/test_transport.py

@ -14,8 +14,8 @@
# under the License.
import fixtures
from mox3 import mox
import six
from six.moves import mox
from stevedore import driver
import testscenarios

Loading…
Cancel
Save