Changeset 391 for python/trunk/Lib/test/test_mutex.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_mutex.py (modified) (2 diffs)

python/trunk/Lib/test/test_mutex.py

@@ -10 +10 @@
         def called_by_mutex(some_data):
             self.assertEqual(some_data, "spam")
-            self.assert_(m.test(), "mutex not held")
+            self.assertTrue(m.test(), "mutex not held")
             # Nested locking
             m.lock(called_by_mutex2, "eggs")
 
         def called_by_mutex2(some_data):
-            self.assertEquals(some_data, "eggs")
-            self.assert_(m.test(), "mutex not held")
-            self.assert_(ready_for_2,
+            self.assertEqual(some_data, "eggs")
+            self.assertTrue(m.test(), "mutex not held")
+            self.assertTrue(ready_for_2,
                          "called_by_mutex2 called too soon")
 
@@ -27 +27 @@
         m.unlock()
         m.unlock()
-        self.failIf(m.test(), "mutex still held")
+        self.assertFalse(m.test(), "mutex still held")
 
 def test_main():