diff options
| author | Brant Knudson <bknudson@us.ibm.com> | 2014-02-21 13:55:26 -0600 |
|---|---|---|
| committer | Brant Knudson <bknudson@us.ibm.com> | 2014-02-21 13:55:26 -0600 |
| commit | 560eff685bba9d3abec6f4d99a60bce71c33b2c1 (patch) | |
| tree | 883048d7a6ca0b1f40a29c21e6047743858e14fe | |
| parent | 1ae0aac511bffed82d981e320c2b460ff419886f (diff) | |
| download | oslo-utils-560eff685bba9d3abec6f4d99a60bce71c33b2c1.tar.gz | |
Fix import order in test_excutils
The tests.unit.test_excutils module would fail to import by
itself because it couldn't import the mox modules from six.moves.
This is because the mox module is registered with six.moves in
openstack.common's __init__ and that hadn't been imported yet.
The fix is to use mox from moxstubout since that part imported
mox already.
Change-Id: I786b9bffba28935f59da0dcf84ef2b5aa3f2b58d
| -rw-r--r-- | tests/unit/test_excutils.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/unit/test_excutils.py b/tests/unit/test_excutils.py index 2e6cdd2..06a1878 100644 --- a/tests/unit/test_excutils.py +++ b/tests/unit/test_excutils.py @@ -15,13 +15,14 @@ import logging import time -from six.moves import mox # noqa - from openstack.common import excutils from openstack.common.fixture import moxstubout from openstack.common import test +mox = moxstubout.mox + + class SaveAndReraiseTest(test.BaseTestCase): def test_save_and_reraise_exception(self): |