Merge remote-tracking branch 'cdist/master'

This commit is contained in:
Steven Armstrong 2011-09-27 15:46:01 +02:00
commit 2db2873d3e

View file

@ -99,7 +99,7 @@ class Config(unittest.TestCase):
])
manifest_fd.close()
self.assertRaises(cdist.Error, self.config.run_initial_manifest())
self.assertRaises(cdist.Error, self.config.run_initial_manifest)
def test_initial_manifest_parameter_added(self):
manifest_fd = open(self.init_manifest, "w")
@ -109,7 +109,7 @@ class Config(unittest.TestCase):
])
manifest_fd.close()
self.assertRaises(cdist.Error, self.config.run_initial_manifest())
self.assertRaises(cdist.Error, self.config.run_initial_manifest)
def test_initial_manifest_parameter_removed(self):
manifest_fd = open(self.init_manifest, "w")
@ -119,7 +119,7 @@ class Config(unittest.TestCase):
])
manifest_fd.close()
self.assertRaises(cdist.Error, self.config.run_initial_manifest())
self.assertRaises(cdist.Error, self.config.run_initial_manifest)
def test_initial_manifest_parameter_twice(self):
manifest_fd = open(self.init_manifest, "w")