Fix use of mock for 1.1.0
Correctly assert the number of calls to a mocked method. Combine this with the change to pin the version of mock used for python 2.6 and raise the minimum version of mock used elsewhere. Change-Id: I8cf1936f06f489561a59ec3cc75a1a8d6419a9ef
This commit is contained in:
parent
781868f2da
commit
061ab83996
@ -946,7 +946,7 @@ class ConfigFileOptsTestCase(BaseTestCase):
|
||||
@mock.patch.object(cfg, 'LOG')
|
||||
def test_conf_file_int_wrong_default(self, mock_log):
|
||||
cfg.IntOpt('foo', default='666')
|
||||
mock_log.debug.assert_call_count(1)
|
||||
self.assertEqual(1, mock_log.debug.call_count)
|
||||
|
||||
def test_conf_file_int_value(self):
|
||||
self.conf.register_opt(cfg.IntOpt('foo'))
|
||||
@ -1025,7 +1025,7 @@ class ConfigFileOptsTestCase(BaseTestCase):
|
||||
@mock.patch.object(cfg, 'LOG')
|
||||
def test_conf_file_float_default_wrong_type(self, mock_log):
|
||||
cfg.FloatOpt('foo', default='foobar6.66')
|
||||
mock_log.debug.assert_call_count(1)
|
||||
self.assertEqual(1, mock_log.debug.call_count)
|
||||
|
||||
def test_conf_file_float_value(self):
|
||||
self.conf.register_opt(cfg.FloatOpt('foo'))
|
||||
|
@ -25,4 +25,5 @@ oslosphinx>=2.5.0 # Apache-2.0
|
||||
oslo.i18n>=1.5.0 # Apache-2.0
|
||||
|
||||
# mocking framework
|
||||
mock>=1.0
|
||||
mock>=1.1;python_version!='2.6'
|
||||
mock==1.0.1;python_version=='2.6'
|
||||
|
@ -951,7 +951,7 @@ class ConfigFileOptsTestCase(BaseTestCase):
|
||||
@mock.patch('oslo_config.cfg.LOG')
|
||||
def test_conf_file_int_wrong_default(self, mock_log):
|
||||
cfg.IntOpt('foo', default='666')
|
||||
mock_log.debug.assert_call_count(1)
|
||||
self.assertEqual(1, mock_log.debug.call_count)
|
||||
|
||||
def test_conf_file_int_value(self):
|
||||
self.conf.register_opt(cfg.IntOpt('foo'))
|
||||
@ -1027,10 +1027,10 @@ class ConfigFileOptsTestCase(BaseTestCase):
|
||||
self.assertTrue(hasattr(self.conf, 'foo'))
|
||||
self.assertEqual(self.conf.foo, 6.66)
|
||||
|
||||
@mock.patch.object(cfg, 'LOG')
|
||||
@mock.patch('oslo_config.cfg.LOG')
|
||||
def test_conf_file_float_default_wrong_type(self, mock_log):
|
||||
cfg.FloatOpt('foo', default='foobar6.66')
|
||||
mock_log.debug.assert_call_count(1)
|
||||
self.assertEqual(1, mock_log.debug.call_count)
|
||||
|
||||
def test_conf_file_float_value(self):
|
||||
self.conf.register_opt(cfg.FloatOpt('foo'))
|
||||
|
Loading…
x
Reference in New Issue
Block a user