Mercurial > public > mercurial-scm > hg
diff tests/test-manifest.py @ 32279:68c43a416585
tests: use context manager form of assertRaises
Support for using unittest.TestCase.assertRaises as a context
manager was added in Python 2.7. This form is more readable,
especially for complex tests.
While I was here, I also restored the use of assertRaisesRegexp,
which was removed in c6921568cd20 for Python 2.6 compatibility.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sat, 13 May 2017 11:52:44 -0700 |
| parents | 94c1d3c1aea2 |
| children | d68f3d6bc214 |
line wrap: on
line diff
--- a/tests/test-manifest.py Sat May 13 11:42:42 2017 -0700 +++ b/tests/test-manifest.py Sat May 13 11:52:44 2017 -0700 @@ -128,7 +128,8 @@ self.assertEqual('l', m.flags('bar/baz/qux.py')) self.assertEqual(BIN_HASH_1, m['foo']) self.assertEqual('', m.flags('foo')) - self.assertRaises(KeyError, lambda : m['wat']) + with self.assertRaises(KeyError): + m['wat'] def testParseManifestV2(self): m1 = self.parsemanifest(A_SHORT_MANIFEST) @@ -213,7 +214,8 @@ self.assertEqual('', m.flags('alpha')) self.assertEqual('l', m.flags('bar/baz/qux.py')) self.assertEqual('', m.flags('beta')) - self.assertRaises(KeyError, lambda : m['foo']) + with self.assertRaises(KeyError): + m['foo'] def testSetGetNodeSuffix(self): clean = self.parsemanifest(A_SHORT_MANIFEST) @@ -255,12 +257,14 @@ assert False return True match.matchfn = filt - self.assertRaises(AssertionError, m.matches, match) + with self.assertRaises(AssertionError): + m.matches(match) def testRemoveItem(self): m = self.parsemanifest(A_SHORT_MANIFEST) del m['foo'] - self.assertRaises(KeyError, lambda : m['foo']) + with self.assertRaises(KeyError): + m['foo'] self.assertEqual(1, len(m)) self.assertEqual(1, len(list(m))) # now restore and make sure everything works right