Merge "Destroy mox forever"

heat/tests/__init__.py

@@ -12,13 +12,8 @@
 #    under the License.
 
 
-import sys
-
-from mox3 import mox
 import oslo_i18n as i18n
 
-sys.modules['mox'] = mox
-
 
 def fake_translate_msgid(msgid, domain, desired_locale=None):
     return msgid

heat/tests/common.py

@@ -15,7 +15,6 @@ import os
 import sys
 
 import fixtures
-import mox
 from oslo_config import cfg
 from oslo_log import log as logging
 import testscenarios
@@ -84,8 +83,6 @@ class HeatTestCase(testscenarios.WithScenarios,
     def setUp(self, mock_keystone=True, mock_resource_policy=True,
               quieten_logging=True):
         super(HeatTestCase, self).setUp()
-        self.m = mox.Mox()
-        self.addCleanup(self.m.UnsetStubs)
         self.setup_logging(quieten=quieten_logging)
         self.warnings = self.useFixture(fixtures.WarningsCapture())
         scheduler.ENABLE_SLEEP = False

lower-constraints.txt

@@ -51,7 +51,6 @@ MarkupSafe==1.0
 mccabe==0.2.1
 mock==2.0.0
 monotonic==1.4
-mox3==0.20.0
 msgpack==0.5.6
 munch==2.2.0
 netaddr==0.7.18

test-requirements.txt

@@ -9,7 +9,6 @@ coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 kombu!=4.0.2,>=4.0.0 # BSD
 mock>=2.0.0 # BSD
-mox3>=0.20.0 # Apache-2.0
 PyMySQL>=0.7.6 # MIT License
 os-testr>=1.0.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0