make test_mutex more elegant

diff --git a/Lib/test/test_mutex.py b/Lib/test/test_mutex.py
index 15e5449231ece109765cbc7ce0f3e07d3d62fbb5..4e3f7cd9e52cd09f020aa7fc55e8bd4da5a8939f 100644 (file)
--- a/Lib/test/test_mutex.py
+++ b/Lib/test/test_mutex.py
@@ -5,26 +5,28 @@ mutex = test.test_support.import_module("mutex", deprecated=True)
 
 class MutexTest(unittest.TestCase):
 
-    def setUp(self):
-        self.mutex = mutex.mutex()
-
-    def called_by_mutex(self, some_data):
-        self.assert_(self.mutex.test(), "mutex not held")
-        # Nested locking
-        self.mutex.lock(self.called_by_mutex2, "eggs")
-
-    def called_by_mutex2(self, some_data):
-        self.assert_(self.ready_for_2,
-                     "called_by_mutex2 called too soon")
-
     def test_lock_and_unlock(self):
-        self.read_for_2 = False
-        self.mutex.lock(self.called_by_mutex, "spam")
-        self.ready_for_2 = True
+
+        def called_by_mutex(some_data):
+            self.assertEqual(some_data, "spam")
+            self.assert_(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,
+                         "called_by_mutex2 called too soon")
+
+        m = mutex.mutex()
+        read_for_2 = False
+        m.lock(called_by_mutex, "spam")
+        ready_for_2 = True
         # unlock both locks
-        self.mutex.unlock()
-        self.mutex.unlock()
-        self.failIf(self.mutex.test(), "mutex still held")
+        m.unlock()
+        m.unlock()
+        self.failIf(m.test(), "mutex still held")
 
 def test_main():
     test.test_support.run_unittest(MutexTest)