From ff5b26fb735b4f6696609ce27332214d79ed1c3f Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Thu, 12 Jan 2012 06:38:23 +0000 Subject: [PATCH] Fix some cfg test case naming conflicts As pointed out by Vish, there are duplicates of: OverridesTestCase::test_default_override OverridesTestCase::test_override SadPathTestCase::test_conf_file_not_found Also, rename the ConfigFileOptsTestCase so it is obvious they don't clash with the tests by the same name in CliOptsTestCase. Change-Id: I5cda3c4796b98eaf0e99589579d0b3bceaf9cd8b --- nova/tests/test_cfg.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/nova/tests/test_cfg.py b/nova/tests/test_cfg.py index b70b7838a..d29d6e231 100644 --- a/nova/tests/test_cfg.py +++ b/nova/tests/test_cfg.py @@ -154,7 +154,7 @@ class CliOptsTestCase(BaseTestCase): class ConfigFileOptsTestCase(BaseTestCase): - def test_str_default(self): + def test_conf_file_str_default(self): self.conf.register_opt(StrOpt('foo', default='bar')) paths = self.create_tempfiles([('test.conf', @@ -165,7 +165,7 @@ class ConfigFileOptsTestCase(BaseTestCase): self.assertTrue(hasattr(self.conf, 'foo')) self.assertEquals(self.conf.foo, 'bar') - def test_str_value(self): + def test_conf_file_str_value(self): self.conf.register_opt(StrOpt('foo')) paths = self.create_tempfiles([('test.conf', @@ -177,7 +177,7 @@ class ConfigFileOptsTestCase(BaseTestCase): self.assertTrue(hasattr(self.conf, 'foo')) self.assertEquals(self.conf.foo, 'bar') - def test_str_value_override(self): + def test_conf_file_str_value_override(self): self.conf.register_cli_opt(StrOpt('foo')) paths = self.create_tempfiles([('1.conf', @@ -194,7 +194,7 @@ class ConfigFileOptsTestCase(BaseTestCase): self.assertTrue(hasattr(self.conf, 'foo')) self.assertEquals(self.conf.foo, 'baaar') - def test_int_default(self): + def test_conf_file_int_default(self): self.conf.register_opt(IntOpt('foo', default=666)) paths = self.create_tempfiles([('test.conf', @@ -205,7 +205,7 @@ class ConfigFileOptsTestCase(BaseTestCase): self.assertTrue(hasattr(self.conf, 'foo')) self.assertEquals(self.conf.foo, 666) - def test_int_value(self): + def test_conf_file_int_value(self): self.conf.register_opt(IntOpt('foo')) paths = self.create_tempfiles([('test.conf', @@ -217,7 +217,7 @@ class ConfigFileOptsTestCase(BaseTestCase): self.assertTrue(hasattr(self.conf, 'foo')) self.assertEquals(self.conf.foo, 666) - def test_int_value_override(self): + def test_conf_file_int_value_override(self): self.conf.register_cli_opt(IntOpt('foo')) paths = self.create_tempfiles([('1.conf', @@ -234,7 +234,7 @@ class ConfigFileOptsTestCase(BaseTestCase): self.assertTrue(hasattr(self.conf, 'foo')) self.assertEquals(self.conf.foo, 666) - def test_float_default(self): + def test_conf_file_float_default(self): self.conf.register_opt(FloatOpt('foo', default=6.66)) paths = self.create_tempfiles([('test.conf', @@ -245,7 +245,7 @@ class ConfigFileOptsTestCase(BaseTestCase): self.assertTrue(hasattr(self.conf, 'foo')) self.assertEquals(self.conf.foo, 6.66) - def test_float_value(self): + def test_conf_file_float_value(self): self.conf.register_opt(FloatOpt('foo')) paths = self.create_tempfiles([('test.conf', @@ -257,7 +257,7 @@ class ConfigFileOptsTestCase(BaseTestCase): self.assertTrue(hasattr(self.conf, 'foo')) self.assertEquals(self.conf.foo, 6.66) - def test_float_value_override(self): + def test_conf_file_float_value_override(self): self.conf.register_cli_opt(FloatOpt('foo')) paths = self.create_tempfiles([('1.conf', @@ -274,7 +274,7 @@ class ConfigFileOptsTestCase(BaseTestCase): self.assertTrue(hasattr(self.conf, 'foo')) self.assertEquals(self.conf.foo, 6.66) - def test_list_default(self): + def test_conf_file_list_default(self): self.conf.register_opt(ListOpt('foo', default=['bar'])) paths = self.create_tempfiles([('test.conf', @@ -285,7 +285,7 @@ class ConfigFileOptsTestCase(BaseTestCase): self.assertTrue(hasattr(self.conf, 'foo')) self.assertEquals(self.conf.foo, ['bar']) - def test_list_value(self): + def test_conf_file_list_value(self): self.conf.register_opt(ListOpt('foo')) paths = self.create_tempfiles([('test.conf', @@ -297,7 +297,7 @@ class ConfigFileOptsTestCase(BaseTestCase): self.assertTrue(hasattr(self.conf, 'foo')) self.assertEquals(self.conf.foo, ['bar']) - def test_list_value_override(self): + def test_conf_file_list_value_override(self): self.conf.register_cli_opt(ListOpt('foo')) paths = self.create_tempfiles([('1.conf', @@ -314,7 +314,7 @@ class ConfigFileOptsTestCase(BaseTestCase): self.assertTrue(hasattr(self.conf, 'foo')) self.assertEquals(self.conf.foo, ['b', 'a', 'r']) - def test_multistr_default(self): + def test_conf_file_multistr_default(self): self.conf.register_opt(MultiStrOpt('foo', default=['bar'])) paths = self.create_tempfiles([('test.conf', @@ -325,7 +325,7 @@ class ConfigFileOptsTestCase(BaseTestCase): self.assertTrue(hasattr(self.conf, 'foo')) self.assertEquals(self.conf.foo, ['bar']) - def test_multistr_value(self): + def test_conf_file_multistr_value(self): self.conf.register_opt(MultiStrOpt('foo')) paths = self.create_tempfiles([('test.conf', @@ -337,7 +337,7 @@ class ConfigFileOptsTestCase(BaseTestCase): self.assertTrue(hasattr(self.conf, 'foo')) self.assertEquals(self.conf.foo, ['bar']) - def test_multistr_values_append(self): + def test_conf_file_multistr_values_append(self): self.conf.register_cli_opt(ListOpt('foo')) paths = self.create_tempfiles([('1.conf', @@ -573,7 +573,7 @@ class OverridesTestCase(BaseTestCase): self.conf.set_default('foo', 'bar', group='blaa') self.assertEquals(self.conf.blaa.foo, 'bar') - def test_default_override(self): + def test_group_default_override(self): self.conf.register_group(OptGroup('blaa')) self.conf.register_opt(StrOpt('foo', default='foo'), group='blaa') self.conf([]) @@ -583,7 +583,7 @@ class OverridesTestCase(BaseTestCase): self.conf.set_default('foo', None, group='blaa') self.assertEquals(self.conf.blaa.foo, 'foo') - def test_override(self): + def test_group_override(self): self.conf.register_group(OptGroup('blaa')) self.conf.register_opt(StrOpt('foo'), group='blaa') self.conf.set_override('foo', 'bar', group='blaa') @@ -674,7 +674,7 @@ class SadPathTestCase(BaseTestCase): self.assertRaises(ConfigFilesNotFoundError, self.conf, ['--config-file', paths[0]]) - def test_conf_file_not_found(self): + def test_conf_file_broken(self): paths = self.create_tempfiles([('test.conf', 'foo')]) self.assertRaises(ConfigFileParseError,