fix threading io-redirection tests

--HG--
branch : trunk

py/thread/testing/test_io.py

@@ -12,14 +12,11 @@ def test_threadout_install_deinstall():
     assert old == sys.stdout
 
 class TestThreadOut:
-    def setup_method(self, method):
-        self.out = ThreadOut(sys, 'stdout')
-    def teardown_method(self, method):
-        self.out.deinstall()
-
     def test_threadout_one(self):
+        out = ThreadOut(sys, 'stdout')
+        try:
             l = []
-        self.out.setwritefunc(l.append)
+            out.setwritefunc(l.append)
             print 42,13,
             x = l.pop(0)
             assert x == '42'
@@ -27,17 +24,20 @@ class TestThreadOut:
             assert x == ' '
             x = l.pop(0)
             assert x == '13'
-
+        finally:
+            out.deinstall()
 
     def test_threadout_multi_and_default(self):
+        out = ThreadOut(sys, 'stdout')
+        try:
             num = 3
             defaults = []
             def f(l):
-            self.out.setwritefunc(l.append)
+                out.setwritefunc(l.append)
                 print id(l),
-            self.out.delwritefunc()
+                out.delwritefunc()
                 print 1
-        self.out.setdefaultwriter(defaults.append)
+            out.setdefaultwriter(defaults.append)
             pool = WorkerPool()
             listlist = []
             for x in range(num):
@@ -45,22 +45,28 @@ class TestThreadOut:
                 listlist.append(l)
                 pool.dispatch(f, l)
             pool.shutdown()
-        for name, value in self.out.__dict__.items():
+            for name, value in out.__dict__.items():
                 print >>sys.stderr, "%s: %s" %(name, value)
             pool.join(2.0)
             for i in range(num):
                 item = listlist[i]
                 assert item ==[str(id(item))]
-        assert not self.out._tid2out
+            assert not out._tid2out
             assert defaults
             expect = ['1' for x in range(num)]
             defaults = [x for x in defaults if x.strip()]
             assert defaults == expect
+        finally:
+            out.deinstall()
 
     def test_threadout_nested(self):
+        out1 = ThreadOut(sys, 'stdout')
+        try:
             # we want ThreadOuts to coexist
             last = sys.stdout
             out = ThreadOut(sys, 'stdout')
             assert last == sys.stdout
             out.deinstall()
             assert last == sys.stdout
+        finally:
+            out1.deinstall()