Merge pull request #80 from moreati/sins-of-the-parent

Fix/split test_master tests following split of mitogen.master -> mitogen.parent

test.sh

@@ -8,6 +8,7 @@ timeout 05.0 python tests/local_test.py
 timeout 05.0 python tests/master_test.py
 timeout 05.0 python tests/module_finder_test.py
 timeout 05.0 python tests/nested_test.py
+timeout 05.0 python tests/parent_test.py
 timeout 05.0 python tests/responder_test.py
 timeout 05.0 python tests/utils_test.py
 timeout 20.0 python tests/select_test.py

tests/data/id_allocation.py

@@ -1,10 +1,10 @@
 
 import mitogen.core
-import mitogen.master
+import mitogen.parent
 
 
 @mitogen.core.takes_econtext
 def allocate_an_id(econtext):
-    mitogen.master.upgrade_router(econtext)
+    mitogen.parent.upgrade_router(econtext)
     return econtext.router.allocate_id()
 

tests/first_stage_test.py

@@ -3,7 +3,7 @@ import subprocess
 
 import unittest2
 
-import mitogen.master
+import mitogen.parent
 import testlib
 
 
@@ -17,7 +17,7 @@ class CommandLineTest(testlib.RouterMixin, testlib.TestCase):
     #   * 3.x starting 2.7
 
     def test_valid_syntax(self):
-        stream = mitogen.master.Stream(self.router, 0)
+        stream = mitogen.parent.Stream(self.router, 0)
         args = stream.get_boot_command()
 
         # Executing the boot command will print "EC0" and expect to read from

tests/master_test.py

@@ -1,7 +1,4 @@
 
-import subprocess
-import time
-
 import unittest2
 
 import testlib
@@ -14,105 +11,11 @@ class ScanCodeImportsTest(unittest2.TestCase):
     def test_simple(self):
         co = compile(open(__file__).read(), __file__, 'exec')
         self.assertEquals(list(self.func(co)), [
-            (-1, 'subprocess', ()),
-            (-1, 'time', ()),
             (-1, 'unittest2', ()),
             (-1, 'testlib', ()),
             (-1, 'mitogen.master', ()),
         ])
 
 
-class IterReadTest(unittest2.TestCase):
-    func = staticmethod(mitogen.master.iter_read)
-
-    def make_proc(self):
-        args = [testlib.data_path('iter_read_generator.sh')]
-        proc = subprocess.Popen(args, stdout=subprocess.PIPE)
-        mitogen.core.set_nonblock(proc.stdout.fileno())
-        return proc
-
-    def test_no_deadline(self):
-        proc = self.make_proc()
-        try:
-            reader = self.func(proc.stdout.fileno())
-            for i, chunk in enumerate(reader, 1):
-                self.assertEqual(i, int(chunk))
-                if i > 3:
-                    break
-        finally:
-            proc.terminate()
-
-    def test_deadline_exceeded_before_call(self):
-        proc = self.make_proc()
-        reader = self.func(proc.stdout.fileno(), 0)
-        try:
-            got = []
-            try:
-                for chunk in reader:
-                    got.append(chunk)
-                assert 0, 'TimeoutError not raised'
-            except mitogen.core.TimeoutError:
-                self.assertEqual(len(got), 0)
-        finally:
-            proc.terminate()
-
-    def test_deadline_exceeded_during_call(self):
-        proc = self.make_proc()
-        reader = self.func(proc.stdout.fileno(), time.time() + 0.4)
-        try:
-            got = []
-            try:
-                for chunk in reader:
-                    got.append(chunk)
-                assert 0, 'TimeoutError not raised'
-            except mitogen.core.TimeoutError:
-                # Give a little wiggle room in case of imperfect scheduling.
-                # Ideal number should be 9.
-                self.assertLess(3, len(got))
-                self.assertLess(len(got), 5)
-        finally:
-            proc.terminate()
-
-
-class WriteAllTest(unittest2.TestCase):
-    func = staticmethod(mitogen.master.write_all)
-
-    def make_proc(self):
-        args = [testlib.data_path('write_all_consumer.sh')]
-        proc = subprocess.Popen(args, stdin=subprocess.PIPE)
-        mitogen.core.set_nonblock(proc.stdin.fileno())
-        return proc
-
-    ten_ms_chunk = ('x' * 65535)
-
-    def test_no_deadline(self):
-        proc = self.make_proc()
-        try:
-            self.func(proc.stdin.fileno(), self.ten_ms_chunk)
-        finally:
-            proc.terminate()
-
-    def test_deadline_exceeded_before_call(self):
-        proc = self.make_proc()
-        try:
-            self.assertRaises(mitogen.core.TimeoutError, (
-                lambda: self.func(proc.stdin.fileno(), self.ten_ms_chunk, 0)
-            ))
-        finally:
-            proc.terminate()
-
-    def test_deadline_exceeded_during_call(self):
-        proc = self.make_proc()
-        try:
-            deadline = time.time() + 0.1   # 100ms deadline
-            self.assertRaises(mitogen.core.TimeoutError, (
-                lambda: self.func(proc.stdin.fileno(),
-                                  self.ten_ms_chunk * 100,  # 1s of data
-                                  deadline)
-            ))
-        finally:
-            proc.terminate()
-
-
 if __name__ == '__main__':
     unittest2.main()

tests/parent_test.py

@@ -0,0 +1,103 @@
+import subprocess
+import time
+
+import unittest2
+
+import mitogen.parent
+import testlib
+
+
+class IterReadTest(unittest2.TestCase):
+    func = staticmethod(mitogen.parent.iter_read)
+
+    def make_proc(self):
+        args = [testlib.data_path('iter_read_generator.sh')]
+        proc = subprocess.Popen(args, stdout=subprocess.PIPE)
+        mitogen.core.set_nonblock(proc.stdout.fileno())
+        return proc
+
+    def test_no_deadline(self):
+        proc = self.make_proc()
+        try:
+            reader = self.func(proc.stdout.fileno())
+            for i, chunk in enumerate(reader, 1):
+                self.assertEqual(i, int(chunk))
+                if i > 3:
+                    break
+        finally:
+            proc.terminate()
+
+    def test_deadline_exceeded_before_call(self):
+        proc = self.make_proc()
+        reader = self.func(proc.stdout.fileno(), 0)
+        try:
+            got = []
+            try:
+                for chunk in reader:
+                    got.append(chunk)
+                assert 0, 'TimeoutError not raised'
+            except mitogen.core.TimeoutError:
+                self.assertEqual(len(got), 0)
+        finally:
+            proc.terminate()
+
+    def test_deadline_exceeded_during_call(self):
+        proc = self.make_proc()
+        reader = self.func(proc.stdout.fileno(), time.time() + 0.4)
+        try:
+            got = []
+            try:
+                for chunk in reader:
+                    got.append(chunk)
+                assert 0, 'TimeoutError not raised'
+            except mitogen.core.TimeoutError:
+                # Give a little wiggle room in case of imperfect scheduling.
+                # Ideal number should be 9.
+                self.assertLess(3, len(got))
+                self.assertLess(len(got), 5)
+        finally:
+            proc.terminate()
+
+
+class WriteAllTest(unittest2.TestCase):
+    func = staticmethod(mitogen.parent.write_all)
+
+    def make_proc(self):
+        args = [testlib.data_path('write_all_consumer.sh')]
+        proc = subprocess.Popen(args, stdin=subprocess.PIPE)
+        mitogen.core.set_nonblock(proc.stdin.fileno())
+        return proc
+
+    ten_ms_chunk = ('x' * 65535)
+
+    def test_no_deadline(self):
+        proc = self.make_proc()
+        try:
+            self.func(proc.stdin.fileno(), self.ten_ms_chunk)
+        finally:
+            proc.terminate()
+
+    def test_deadline_exceeded_before_call(self):
+        proc = self.make_proc()
+        try:
+            self.assertRaises(mitogen.core.TimeoutError, (
+                lambda: self.func(proc.stdin.fileno(), self.ten_ms_chunk, 0)
+            ))
+        finally:
+            proc.terminate()
+
+    def test_deadline_exceeded_during_call(self):
+        proc = self.make_proc()
+        try:
+            deadline = time.time() + 0.1   # 100ms deadline
+            self.assertRaises(mitogen.core.TimeoutError, (
+                lambda: self.func(proc.stdin.fileno(),
+                                  self.ten_ms_chunk * 100,  # 1s of data
+                                  deadline)
+            ))
+        finally:
+            proc.terminate()
+
+
+if __name__ == '__main__':
+    unittest2.main()