changeset 32279 | 68c43a416585 |
parent 28927 | 2d433fa7ff44 |
child 37084 | f0b6fbea00cf |
--- a/tests/test-simplemerge.py Sat May 13 11:42:42 2017 -0700 +++ b/tests/test-simplemerge.py Sat May 13 11:52:44 2017 -0700 @@ -326,7 +326,8 @@ self.assertEquals(ml, MERGED_RESULT) def test_binary(self): - self.assertRaises(error.Abort, Merge3, ['\x00'], ['a'], ['b']) + with self.assertRaises(error.Abort): + Merge3(['\x00'], ['a'], ['b']) def test_dos_text(self): base_text = 'a\r\n'