Replace assertRaisesRegexp by assertRaises (python2.6 compatibility)

This commit is contained in:
Emmanuel Leblond 2015-06-11 14:36:51 +02:00
parent 4034ab4182
commit 153c239c9b

View File

@ -958,8 +958,7 @@ class InstanceTest(unittest.TestCase):
flip(w1) flip(w1)
self.assertTrue(w1.toggle) self.assertTrue(w1.toggle)
self.assertEqual(w1.count, 1) self.assertEqual(w1.count, 1)
self.assertRaisesRegexp(OperationError, self.assertRaises(OperationError,
"Race condition preventing document update detected",
w1.save, save_condition={'save_id': UUID(42)}) w1.save, save_condition={'save_id': UUID(42)})
w1.reload() w1.reload()
self.assertFalse(w1.toggle) self.assertFalse(w1.toggle)
@ -988,8 +987,7 @@ class InstanceTest(unittest.TestCase):
self.assertEqual(w1.count, 2) self.assertEqual(w1.count, 2)
flip(w2) flip(w2)
flip(w2) flip(w2)
self.assertRaisesRegexp(OperationError, self.assertRaises(OperationError,
"Race condition preventing document update detected",
w2.save, save_condition={'save_id': old_id}) w2.save, save_condition={'save_id': old_id})
w2.reload() w2.reload()
self.assertFalse(w2.toggle) self.assertFalse(w2.toggle)
@ -1002,8 +1000,7 @@ class InstanceTest(unittest.TestCase):
self.assertTrue(w1.toggle) self.assertTrue(w1.toggle)
self.assertEqual(w1.count, 3) self.assertEqual(w1.count, 3)
flip(w1) flip(w1)
self.assertRaisesRegexp(OperationError, self.assertRaises(OperationError,
"Race condition preventing document update detected",
w1.save, save_condition={'count__gte': w1.count}) w1.save, save_condition={'count__gte': w1.count})
w1.reload() w1.reload()
self.assertTrue(w1.toggle) self.assertTrue(w1.toggle)