openstack/oslo.config
Code Issues Proposed changes

Fix parameters of assertEqual are misplaced

Browse Source 
Many assertEqual sentences don't follow assertEqual(expected, actual),
this patch fix all of them.

Change-Id: Ia2fbad7a952039fbba4cddc3308721a19dd099d1
Closes-Bug: 1604213
This commit is contained in:
yan.haifeng 2016-07-19 11:46:45 +08:00
parent 55c2026576
commit 61224ce932
3 changed files with 235 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

444
oslo_config/tests/test_cfg.py
View File

File diff suppressed because it is too large Load Diff

8
oslo_config/tests/test_cfgfilter.py
View File

@ -322,13 +322,13 @@ class ExposeTestCase(BaseTestCase):
self.conf.set_override('foo', 'bar')
self.assertTrue(hasattr(self.conf, 'foo'))
self.assertEqual(self.conf.foo, 'bar')
self.assertEqual('bar', self.conf.foo)
self.assertFalse(hasattr(self.fconf, 'foo'))
self.fconf.expose_opt('foo')
self.assertTrue(hasattr(self.conf, 'foo'))
self.assertTrue(hasattr(self.fconf, 'foo'))
self.assertEqual(self.fconf.foo, 'bar')
self.assertEqual('bar', self.fconf.foo)
def test_expose_opt_with_group(self):
self.assertFalse(hasattr(self.conf, 'foo'))
@ -338,13 +338,13 @@ class ExposeTestCase(BaseTestCase):
self.conf.set_override('foo', 'bar', group='group')
self.assertTrue(hasattr(self.conf.group, 'foo'))
self.assertEqual(self.conf.group.foo, 'bar')
self.assertEqual('bar', self.conf.group.foo)
self.assertFalse(hasattr(self.fconf, 'group'))
self.fconf.expose_opt('foo', group='group')
self.assertTrue(hasattr(self.conf.group, 'foo'))
self.assertTrue(hasattr(self.fconf.group, 'foo'))
self.assertEqual(self.fconf.group.foo, 'bar')
self.assertEqual('bar', self.fconf.group.foo)
def test_expose_group(self):
self.conf.register_opts([cfg.StrOpt('foo'),

18
oslo_config/tests/test_iniparser.py
View File

@ -66,22 +66,22 @@ class ParserTestCase(unittest.TestCase):
def test_blank_line(self):
lines = [""]
self.parser.parse(lines)
self.assertEqual(self.parser.values, {})
self.assertEqual({}, self.parser.values)
def test_assignment_equal(self):
lines = ["foo = bar"]
self.parser.parse(lines)
self.assertEqual(self.parser.values, {'': {'foo': ['bar']}})
self.assertEqual({'': {'foo': ['bar']}}, self.parser.values)
def test_assignment_colon(self):
lines = ["foo: bar"]
self.parser.parse(lines)
self.assertEqual(self.parser.values, {'': {'foo': ['bar']}})
self.assertEqual({'': {'foo': ['bar']}}, self.parser.values)
def test_assignment_multiline(self):
lines = ["foo = bar0", " bar1"]
self.parser.parse(lines)
self.assertEqual(self.parser.values, {'': {'foo': ['bar0', 'bar1']}})
self.assertEqual({'': {'foo': ['bar0', 'bar1']}}, self.parser.values)
def test_assignment_multline_empty(self):
lines = ["foo = bar0", "", " bar1"]
@ -90,12 +90,12 @@ class ParserTestCase(unittest.TestCase):
def test_section_assignment(self):
lines = ["[test]", "foo = bar"]
self.parser.parse(lines)
self.assertEqual(self.parser.values, {'test': {'foo': ['bar']}})
self.assertEqual({'test': {'foo': ['bar']}}, self.parser.values)
def test_new_section(self):
lines = ["[foo]"]
self.parser.parse(lines)
self.assertEqual(self.parser.section, 'foo')
self.assertEqual('foo', self.parser.section)
def test_comment(self):
lines = ["# foobar"]
@ -105,17 +105,17 @@ class ParserTestCase(unittest.TestCase):
def test_empty_assignment(self):
lines = ["foo = "]
self.parser.parse(lines)
self.assertEqual(self.parser.values, {'': {'foo': ['']}})
self.assertEqual({'': {'foo': ['']}}, self.parser.values)
def test_assignment_space_single_quote(self):
lines = ["foo = ' bar '"]
self.parser.parse(lines)
self.assertEqual(self.parser.values, {'': {'foo': [' bar ']}})
self.assertEqual({'': {'foo': [' bar ']}}, self.parser.values)
def test_assignment_space_double_quote(self):
lines = ["foo = \" bar \""]
self.parser.parse(lines)
self.assertEqual(self.parser.values, {'': {'foo': [' bar ']}})
self.assertEqual({'': {'foo': [' bar ']}}, self.parser.values)
class ExceptionTestCase(unittest.TestCase):