openstack/deb-python-pecan
Code Issues Proposed changes

Cleaning up some hard-to-read tests.

Browse Source
This commit is contained in:
Ryan Petrello
2012-03-07 17:14:26 -05:00
parent 63b9ad6948
commit 06fe8a12e1
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pecan/tests/test_conf.py
View File

@@ -100,46 +100,41 @@ class TestConf(TestCase):
def test_config_missing_file(self):
path = ('doesnotexist.py',)
conf = configuration.Config({})
call_ = lambda path: conf.update(configuration.conf_from_file(os.path.join(
self.assertRaises(IOError, configuration.conf_from_file, os.path.join(
__here__,
'test_config',
*path
)))
self.assertRaises(IOError, call_, path)
))
def test_config_missing_file_on_path(self):
path = ('bad', 'bad', 'doesnotexist.py',)
conf = configuration.Config({})
call_ = lambda path: conf.update(configuration.conf_from_file(os.path.join(
self.assertRaises(IOError, configuration.conf_from_file, os.path.join(
__here__,
'test_config',
*path
)))
self.assertRaises(IOError, call_, path)
))
def test_config_with_syntax_error(self):
path = ('bad', 'syntaxerror.py')
conf = configuration.Config({})
call_ = lambda path: conf.update(configuration.conf_from_file(os.path.join(
self.assertRaises(SyntaxError, configuration.conf_from_file, os.path.join(
__here__,
'test_config',
*path
)))
self.assertRaises(SyntaxError, call_, path)
))
def test_config_with_bad_import(self):
path = ('bad', 'importerror.py')
conf = configuration.Config({})
call_ = lambda path: conf.update(configuration.conf_from_file(os.path.join(
self.assertRaises(ImportError, configuration.conf_from_file, os.path.join(
__here__,
'test_config',
*path
)))
self.assertRaises(ImportError, call_, path)
))
def test_config_set_from_file(self):
path = os.path.join(os.path.dirname(__file__), 'test_config', 'empty.py')