Get mox from mox3, not from six.moves
oslotest 1.7.0 breakes oslo.messaging unittests, because it doesn't add mox to six.moves anymore - see change Ic59c73abb9b09cb594bf7df4173d7f99f81d526c This patch fixes imports on test run. Change-Id: Ia40b7733bd2e74b1a1703f2e1a5245f01debbd36
This commit is contained in:
parent
85c069e154
commit
2e5ba4538e
@ -14,9 +14,9 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import fixtures
|
import fixtures
|
||||||
|
from mox3 import mox
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
import six
|
import six
|
||||||
from six.moves import mox
|
|
||||||
from stevedore import driver
|
from stevedore import driver
|
||||||
import testscenarios
|
import testscenarios
|
||||||
|
|
||||||
|
@ -14,8 +14,8 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import fixtures
|
import fixtures
|
||||||
|
from mox3 import mox
|
||||||
import six
|
import six
|
||||||
from six.moves import mox
|
|
||||||
from stevedore import driver
|
from stevedore import driver
|
||||||
import testscenarios
|
import testscenarios
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user