diff options
author | ChangBo Guo(gcb) <eric.guo@easystack.cn> | 2017-11-29 13:15:40 +0800 |
---|---|---|
committer | ChangBo Guo(gcb) <eric.guo@easystack.cn> | 2017-11-29 13:18:39 +0800 |
commit | aee63832f6bfb01086b15fe16a773bb4175655e6 (patch) | |
tree | 01a8319d75d7cc655ca5f0356b1348887c9ed1ea | |
parent | eb6ff02d4b863bad7bf04a5a78d501450e8c0b93 (diff) | |
download | oslo-config-aee63832f6bfb01086b15fe16a773bb4175655e6.tar.gz |
Clean up enforce_type related test method's name
This is follow up of I8a5e868e0adc2c7b6f46f56ee77a8129c34badb9,
need remove enforce_type from test method's name. This commit
also remove test_enforce_type_default_override which is duplicated
with test_default_override.
Change-Id: Ibc7661993247d0510a08c4a890ba7476be8a32b0
-rw-r--r-- | oslo_config/tests/test_cfg.py | 23 | ||||
-rw-r--r-- | oslo_config/tests/test_fixture.py | 2 |
2 files changed, 8 insertions, 17 deletions
diff --git a/oslo_config/tests/test_cfg.py b/oslo_config/tests/test_cfg.py index a23e6b3..2da4bf6 100644 --- a/oslo_config/tests/test_cfg.py +++ b/oslo_config/tests/test_cfg.py @@ -3237,16 +3237,7 @@ class OverridesTestCase(BaseTestCase): self.assertRaises(ValueError, self.conf.set_default, 'oo', 'c', 'f') - def test_enforce_type_default_override(self): - self.conf.register_opt(cfg.StrOpt('foo', default='foo')) - self.conf([]) - self.assertEqual('foo', self.conf.foo) - self.conf.set_default('foo', 'bar') - self.assertEqual('bar', self.conf.foo) - self.conf.clear_default('foo') - self.assertEqual('foo', self.conf.foo) - - def test_enforce_type_wrong_type_default(self): + def test_wrong_type_default_override(self): self.conf.register_opt(cfg.IntOpt('foo', default=1)) self.conf([]) self.assertEqual(1, self.conf.foo) @@ -3322,7 +3313,7 @@ class OverridesTestCase(BaseTestCase): self.conf.clear_override('foo') self.assertIsNone(self.conf.foo) - def test_enforce_type_str_override(self): + def test__str_override(self): self.conf.register_opt(cfg.StrOpt('foo')) self.conf.set_override('foo', True) self.conf([]) @@ -3330,7 +3321,7 @@ class OverridesTestCase(BaseTestCase): self.conf.clear_override('foo') self.assertIsNone(self.conf.foo) - def test_enforce_type_wrong_type_override(self): + def test__wrong_type_override(self): self.conf.register_opt(cfg.IntOpt('foo')) self.assertRaises(ValueError, self.conf.set_override, 'foo', "not_really_a_int") @@ -3349,7 +3340,7 @@ class OverridesTestCase(BaseTestCase): self.assertRaises(ValueError, self.conf.set_override, 'oo', 'c', 'f') - def test_enforce_type_bool_override(self): + def test_bool_override(self): self.conf.register_opt(cfg.BoolOpt('foo')) self.conf.set_override('foo', 'True') self.conf([]) @@ -3357,7 +3348,7 @@ class OverridesTestCase(BaseTestCase): self.conf.clear_override('foo') self.assertIsNone(self.conf.foo) - def test_enforce_type_int_override_with_None(self): + def test_int_override_with_None(self): self.conf.register_opt(cfg.IntOpt('foo')) self.conf.set_override('foo', None) self.conf([]) @@ -3365,7 +3356,7 @@ class OverridesTestCase(BaseTestCase): self.conf.clear_override('foo') self.assertIsNone(self.conf.foo) - def test_enforce_type_str_override_with_None(self): + def test_str_override_with_None(self): self.conf.register_opt(cfg.StrOpt('foo')) self.conf.set_override('foo', None) self.conf([]) @@ -3373,7 +3364,7 @@ class OverridesTestCase(BaseTestCase): self.conf.clear_override('foo') self.assertIsNone(self.conf.foo) - def test_enforce_type_List_override(self): + def test_List_override(self): self.conf.register_opt(cfg.ListOpt('foo')) self.conf.set_override('foo', ['aa', 'bb']) self.conf([]) diff --git a/oslo_config/tests/test_fixture.py b/oslo_config/tests/test_fixture.py index 19ade13..fb85bc8 100644 --- a/oslo_config/tests/test_fixture.py +++ b/oslo_config/tests/test_fixture.py @@ -42,7 +42,7 @@ class ConfigTestCase(base.BaseTestCase): self.assertEqual('changed_value', f.conf.get('testing_option')) - def test_overridden_value_with_enforce_type(self): + def test_overridden_value_with_wrong_type(self): f = self._make_fixture() self.assertEqual(5, f.conf.get('test2')) self.assertEqual('a', f.conf.get('test3')) |