openstack/heat
Code Issues Proposed changes

Merge "Destroy mox forever"

Browse Source
This commit is contained in:
Zuul 2018-07-10 09:21:24 +00:00 committed by Gerrit Code Review
commit 2cd021b483
4 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/tests/__init__.py
View File

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

3
heat/tests/common.py
View File

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

1
lower-constraints.txt
View File

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

1
test-requirements.txt
View File

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