Moved parallel test files to parallel subpackages

and tweaks related to tests

IPython/zmq/parallel/controller.py

@@ -28,7 +28,7 b' from IPython.zmq.entry_point import bind_port'
 
 from streamsession import Message, wrap_exception
 from entry_point import (make_base_argument_parser, select_random_ports, split_ports,
-                        connect_logger, parse_url)
+                        connect_logger, parse_url, signal_children)
 
 #-----------------------------------------------------------------------------
 # Code
@@ -882,6 +882,7 b' def main():'
     sub = ZMQStream(sub, loop)
     
     ports = select_random_ports(random_ports)
+    children = []
     # Multiplexer Queue (in a Process)
     if not mux:
         mux = (ports.pop(),ports.pop())
@@ -891,6 +892,7 b' def main():'
     q.connect_mon(iface%monport)
     q.daemon=True
     q.start()
+    children.append(q.launcher)
     
     # Control Queue (in a Process)
     if not control:
@@ -901,7 +903,7 b' def main():'
     q.connect_mon(iface%monport)
     q.daemon=True
     q.start()
-    
+    children.append(q.launcher)
     # Task Queue (in a Process)
     if not task:
         task = (ports.pop(),ports.pop())
@@ -912,12 +914,14 b' def main():'
         q.connect_mon(iface%monport)
         q.daemon=True
         q.start()
+        children.append(q.launcher)
     else:
         sargs = (iface%task[0],iface%task[1],iface%monport,iface%nport,args.scheduler)
         print (sargs)
-        p = Process(target=launch_scheduler, args=sargs)
-        p.daemon=True
-        p.start()
+        q = Process(target=launch_scheduler, args=sargs)
+        q.daemon=True
+        q.start()
+        children.append(q)
     
     time.sleep(.25)
     
@@ -937,9 +941,13 b' def main():'
         'task' : iface%task[0],
         'notification': iface%nport
         }
+    signal_children(children)
     con = Controller(loop, thesession, sub, reg, hmon, c, n, None, engine_addrs, client_addrs)
     dc = ioloop.DelayedCallback(lambda : print("Controller started..."), 100, loop)
     loop.start()
+    
+    
+    
 
 if __name__ == '__main__':
     main()

IPython/zmq/parallel/entry_point.py

@@ -5,10 +5,15 b' launchers.'
 # Standard library imports.
 import logging
 import atexit
+import sys
 import os
 import socket
 from subprocess import Popen, PIPE
-import sys
+from signal import signal, SIGINT, SIGABRT, SIGTERM
+try:
+    from signal import SIGKILL
+except ImportError:
+    SIGKILL=None
 
 # System library imports.
 import zmq
@@ -50,8 +55,14 b' def parse_url(args):'
         if iface[1]:
             args.regport = iface[1]
     args.url = "%s://%s:%i"%(args.transport, args.ip,args.regport)
-    
-        
+
+def signal_children(children):
+    def terminate_children(sig, frame):
+        for child in children:
+            child.terminate()
+        # sys.exit(sig)
+    for sig in (SIGINT, SIGABRT, SIGTERM):
+        signal(sig, terminate_children)
 
 def make_base_argument_parser():
     """ Creates an ArgumentParser for the generic arguments supported by all 

IPython/zmq/parallel/heartmonitor.py

@@ -28,6 +28,7 b' class Heart(object):'
     id=None
     def __init__(self, in_addr, out_addr, in_type=zmq.SUB, out_type=zmq.XREQ, heart_id=None):
         self.device = ProcessDevice(zmq.FORWARDER, in_type, out_type)
+        self.device.daemon=True
         self.device.connect_in(in_addr)
         self.device.connect_out(out_addr)
         if in_type == zmq.SUB:

IPython/zmq/parallel/tests/test_newserialized.py

@@ -1,4 +1,4 b''
 
 from unittest import TestCase
-from zmq.tests import BaseZMQTest
+# from zmq.tests import BaseZMQTest