diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-13 12:29:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-13 12:29:40 +0000 |
| commit | 815c8f35b5fe75f013a99156118023d82598e003 (patch) | |
| tree | 3595b709e100307692f0fe3b1805e3b54e0de300 /tests | |
| parent | 0a36c92e84be0f432b8ce792834dc297196e09af (diff) | |
| parent | 513bd3a917207099125cc044705aee438fee7143 (diff) | |
| download | oslo-815c8f35b5fe75f013a99156118023d82598e003.tar.gz oslo-815c8f35b5fe75f013a99156118023d82598e003.tar.xz oslo-815c8f35b5fe75f013a99156118023d82598e003.zip | |
Merge "Allow set_default and set_override to use None"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/test_cfg.py | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/tests/unit/test_cfg.py b/tests/unit/test_cfg.py index 0d11863..e58f12c 100644 --- a/tests/unit/test_cfg.py +++ b/tests/unit/test_cfg.py @@ -982,12 +982,32 @@ class ReparseTestCase(BaseTestCase): class OverridesTestCase(BaseTestCase): + def test_default_none(self): + self.conf.register_opt(StrOpt('foo', default='foo')) + self.conf([]) + self.assertEquals(self.conf.foo, 'foo') + self.conf.set_default('foo', None) + self.assertEquals(self.conf.foo, None) + self.conf.clear_default('foo') + self.assertEquals(self.conf.foo, 'foo') + + def test_override_none(self): + self.conf.register_opt(StrOpt('foo', default='foo')) + self.conf([]) + self.assertEquals(self.conf.foo, 'foo') + self.conf.set_override('foo', None) + self.assertEquals(self.conf.foo, None) + self.conf.clear_override('foo') + self.assertEquals(self.conf.foo, 'foo') + def test_no_default_override(self): self.conf.register_opt(StrOpt('foo')) self.conf([]) self.assertEquals(self.conf.foo, None) self.conf.set_default('foo', 'bar') self.assertEquals(self.conf.foo, 'bar') + self.conf.clear_default('foo') + self.assertEquals(self.conf.foo, None) def test_default_override(self): self.conf.register_opt(StrOpt('foo', default='foo')) @@ -995,7 +1015,7 @@ class OverridesTestCase(BaseTestCase): self.assertEquals(self.conf.foo, 'foo') self.conf.set_default('foo', 'bar') self.assertEquals(self.conf.foo, 'bar') - self.conf.set_default('foo', None) + self.conf.clear_default('foo') self.assertEquals(self.conf.foo, 'foo') def test_override(self): @@ -1003,6 +1023,8 @@ class OverridesTestCase(BaseTestCase): self.conf.set_override('foo', 'bar') self.conf([]) self.assertEquals(self.conf.foo, 'bar') + self.conf.clear_override('foo') + self.assertEquals(self.conf.foo, None) def test_group_no_default_override(self): self.conf.register_group(OptGroup('blaa')) @@ -1011,6 +1033,8 @@ class OverridesTestCase(BaseTestCase): self.assertEquals(self.conf.blaa.foo, None) self.conf.set_default('foo', 'bar', group='blaa') self.assertEquals(self.conf.blaa.foo, 'bar') + self.conf.clear_default('foo', group='blaa') + self.assertEquals(self.conf.blaa.foo, None) def test_group_default_override(self): self.conf.register_group(OptGroup('blaa')) @@ -1019,15 +1043,18 @@ class OverridesTestCase(BaseTestCase): self.assertEquals(self.conf.blaa.foo, 'foo') self.conf.set_default('foo', 'bar', group='blaa') self.assertEquals(self.conf.blaa.foo, 'bar') - self.conf.set_default('foo', None, group='blaa') + self.conf.clear_default('foo', group='blaa') self.assertEquals(self.conf.blaa.foo, 'foo') def test_group_override(self): self.conf.register_group(OptGroup('blaa')) self.conf.register_opt(StrOpt('foo'), group='blaa') + self.assertEquals(self.conf.blaa.foo, None) self.conf.set_override('foo', 'bar', group='blaa') self.conf([]) self.assertEquals(self.conf.blaa.foo, 'bar') + self.conf.clear_override('foo', group='blaa') + self.assertEquals(self.conf.blaa.foo, None) class ResetAndClearTestCase(BaseTestCase): |