From 153c239c9bcb9acbc3f87c0d89995a128e4e934f Mon Sep 17 00:00:00 2001 From: Emmanuel Leblond Date: Thu, 11 Jun 2015 14:36:51 +0200 Subject: [PATCH] Replace assertRaisesRegexp by assertRaises (python2.6 compatibility) --- tests/document/instance.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/document/instance.py b/tests/document/instance.py index 29692c20..e1710b9f 100644 --- a/tests/document/instance.py +++ b/tests/document/instance.py @@ -958,8 +958,7 @@ class InstanceTest(unittest.TestCase): flip(w1) self.assertTrue(w1.toggle) self.assertEqual(w1.count, 1) - self.assertRaisesRegexp(OperationError, - "Race condition preventing document update detected", + self.assertRaises(OperationError, w1.save, save_condition={'save_id': UUID(42)}) w1.reload() self.assertFalse(w1.toggle) @@ -988,8 +987,7 @@ class InstanceTest(unittest.TestCase): self.assertEqual(w1.count, 2) flip(w2) flip(w2) - self.assertRaisesRegexp(OperationError, - "Race condition preventing document update detected", + self.assertRaises(OperationError, w2.save, save_condition={'save_id': old_id}) w2.reload() self.assertFalse(w2.toggle) @@ -1002,8 +1000,7 @@ class InstanceTest(unittest.TestCase): self.assertTrue(w1.toggle) self.assertEqual(w1.count, 3) flip(w1) - self.assertRaisesRegexp(OperationError, - "Race condition preventing document update detected", + self.assertRaises(OperationError, w1.save, save_condition={'count__gte': w1.count}) w1.reload() self.assertTrue(w1.toggle)