openstack/swift
Code Issues Proposed changes

updated readconf test

Browse Source
This commit is contained in:
John Dickinson 2010-10-08 14:55:43 -05:00
parent 8ee2cbaeee
commit 60d159fd39
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/unit/common/test_utils.py
View File

@ -257,22 +257,21 @@ log_name = yarr'''
f.write(conf) f.write(conf)
f.close() f.close()
result = utils.readconf('/tmp/test') result = utils.readconf('/tmp/test')
expected = {'section1': {'foo': 'bar'}, 'section2': {'log_name': 'yarr'}} expected = {'log_name': None,
'section1': {'foo': 'bar'},
'section2': {'log_name': 'yarr'}}
self.assertEquals(result, expected) self.assertEquals(result, expected)
result = utils.readconf('/tmp/test', 'section1') result = utils.readconf('/tmp/test', 'section1')
expected = {'foo': 'bar'} expected = {'log_name': 'section1', 'foo': 'bar'}
self.assertEquals(result, expected) self.assertEquals(result, expected)
result = utils.readconf('/tmp/test', 'section2').get('log_name') result = utils.readconf('/tmp/test', 'section2').get('log_name')
expected = 'yarr' expected = 'yarr'
self.assertEquals(result, expected) self.assertEquals(result, expected)
result = utils.readconf('/tmp/test', 'section1').get('log_name')
expected = 'section1'
self.assertEquals(result, expected)
result = utils.readconf('/tmp/test', 'section1', log_name='foo').get('log_name') result = utils.readconf('/tmp/test', 'section1', log_name='foo').get('log_name')
expected = 'foo' expected = 'foo'
self.assertEquals(result, expected) self.assertEquals(result, expected)
result = utils.readconf('/tmp/test', 'section1', defaults={'bar': 'baz'}) result = utils.readconf('/tmp/test', 'section1', defaults={'bar': 'baz'})
expected = {'foo': 'bar', 'bar': 'baz'} expected = {'log_name': 'section1', 'foo': 'bar', 'bar': 'baz'}
self.assertEquals(result, expected) self.assertEquals(result, expected)
os.unlink('/tmp/test') os.unlink('/tmp/test')