Reorganized the CM test so it should pass on py2.4.

pyrasite/tests/context_manager_case.py

+""" This is kept in a separate file so that python2.4 never picks it up. """
+
+import pyrasite
+
+
+def context_manager_business(case):
+    # Check that the context manager injects ipc correctly.
+    with pyrasite.PyrasiteIPC(case.p.pid) as ipc:
+        assert ipc.cmd('print("mu")') == 'mu\n'
+
+    # Check that the context manager closes the ipc correctly.
+    try:
+        ipc.cmd('print("mu")')
+        assert False, "The connection was not closed."
+    except IOError as e:
+        assert "Bad file descriptor" in str(e)

pyrasite/tests/test_context_manager.py

-import sys
-import unittest
-
-import pyrasite
-from pyrasite.tests.utils import run_program, generate_program, stop_program
-
-
-class TestIPCContextManager(unittest.TestCase):
-
-    def setUp(self):
-        self.prog = generate_program()
-        self.p = run_program(self.prog)
-
-    def tearDown(self):
-        stop_program(self.p)
-
-    def test_context_manager(self):
-
-        # Check that we're on a version of python that
-        # supports context managers
-        info = sys.version_info
-        major, minor = info[0], info[1]
-        if major <= 2 and minor <= 5:
-            self.skipTest("Context Managers not supported on Python<=2.5")
-
-        # Check that the context manager injects ipc correctly.
-        with pyrasite.PyrasiteIPC(self.p.pid) as ipc:
-            assert ipc.cmd('print("mu")') == 'mu\n'
-
-        # Check that the context manager closes the ipc correctly.
-        try:
-            ipc.cmd('print("mu")')
-            assert False, "The connection was not closed."
-        except IOError as e:
-            assert "Bad file descriptor" in str(e)

pyrasite/tests/test_ipc.py

@@ -16,12 +16,37 @@
 # Copyright (C) 2011, 2012 Red Hat, Inc.
 
 import os
+import sys
 import unittest
 
 import pyrasite
 from pyrasite.tests.utils import run_program, generate_program, stop_program
 
 
+class TestIPCContextManager(unittest.TestCase):
+
+    def setUp(self):
+        self.prog = generate_program()
+        self.p = run_program(self.prog)
+
+    def tearDown(self):
+        stop_program(self.p)
+
+    def test_context_manager(self):
+        # Check that we're on a version of python that
+        # supports context managers
+        info = sys.version_info
+        major, minor = info[0], info[1]
+        if major <= 2 and minor <= 5:
+            self.skipTest("Context Managers not supported on Python<=2.5")
+
+        # Otherwise import a module which contains modern syntax.
+        # It really contains our test case, but we have pushed it out into
+        # another module so that python 2.4 never sees it.
+        import context_manager_case
+        context_manager_case.context_manager_business(self)
+
+
 class TestIPC(unittest.TestCase):
 
     def setUp(self):