CaptureMock 2.7.2__tar.gz → 2.7.4__tar.gz

{capturemock-2.7.2 → capturemock-2.7.4}/CaptureMock.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CaptureMock
-Version: 2.7.2
+Version: 2.7.4
 Summary: A tool for creating mocks via a capture-replay style approach
 Author-email: Geoff Bache <geoff.bache@pobox.com>
 Project-URL: Homepage, http://www.texttest.org/index.php?page=capturemock

{capturemock-2.7.2 → capturemock-2.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CaptureMock
-Version: 2.7.2
+Version: 2.7.4
 Summary: A tool for creating mocks via a capture-replay style approach
 Author-email: Geoff Bache <geoff.bache@pobox.com>
 Project-URL: Homepage, http://www.texttest.org/index.php?page=capturemock

{capturemock-2.7.2 → capturemock-2.7.4}/capturemock/__init__.py

@@ -12,7 +12,7 @@ from datetime import datetime
 import bisect
 from urllib.request import urlopen
 
-version = "2.7.2"
+version = "2.7.4"
 
 class CaptureMockManager:
     fileContents = "import capturemock; capturemock.interceptCommand()\n"
@@ -39,7 +39,8 @@ class CaptureMockManager:
                     sutDirectory=os.getcwd(),
                     environment=os.environ,
                     stderrFn=None,
-                    recordFromUrl=None):
+                    recordFromUrl=None, 
+                    port=0):
         if config.isActive(mode, replayFile):
             # Environment which the server should get
             environment["CAPTUREMOCK_MODE"] = str(mode)
@@ -59,7 +60,8 @@ class CaptureMockManager:
                                                     recordEditDir,
                                                     sutDirectory,
                                                     environment,
-                                                    stderrFn)
+                                                    stderrFn, 
+                                                    port)
             self.serverProtocol = rcHandler.get("server_protocol", [ "general" ], "classic")
             self.serverAddress = self.readServerAddress()
 

{capturemock-2.7.2 → capturemock-2.7.4}/capturemock/amqptraffic.py

@@ -93,7 +93,7 @@ class AMQPConnector:
 
 class AMQPTrafficServer:
     @classmethod
-    def createServer(cls, address, dispatcher):
+    def createServer(cls, address, port, dispatcher):
         return cls(dispatcher)
     
     def __init__(self, dispatcher):

{capturemock-2.7.2 → capturemock-2.7.4}/capturemock/binarytcptraffic.py

@@ -1009,15 +1009,15 @@ class SynchStatusTraffic(clientservertraffic.ClientSocketTraffic):
 class TcpHeaderTrafficServer:
     synch_server_locations = []
     @classmethod
-    def createServer(cls, address, dispatcher):
-        return cls(address, dispatcher)
+    def createServer(cls, *args):
+        return cls(*args)
 
-    def __init__(self, address, dispatcher):
+    def __init__(self, address, port, dispatcher):
         self.dispatcher = dispatcher
         self.connection_timeout = dispatcher.rcHandler.getfloat("connection_timeout", [ "general" ], 0.2)
         self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.socket.settimeout(self.connection_timeout)
-        self.socket.bind((address, 0))
+        self.socket.bind((address, port))
         self.socket.listen()
         self.diag = get_logger()
         self.clientConverter = None

{capturemock-2.7.2 → capturemock-2.7.4}/capturemock/cmdlineutils.py

@@ -19,4 +19,6 @@ CaptureMock command line program. Records and replays interaction defined by stu
     parser.add_option("-F", "--record-file-edits", 
                       help="store edited files under DIR.", metavar="DIR")
     parser.add_option("-R", "--rcfiles", help="Read configuration from given rc files, defaults to ~/.capturemock/config")
+    parser.add_option("-P", "--port", type="int", default=0,
+                      help="Port to run CaptureMock on", metavar="PORT")
     return parser

{capturemock-2.7.2 → capturemock-2.7.4}/capturemock/ftptraffic.py

@@ -57,8 +57,8 @@ class FTPTrafficHandler(FTPHandler):
 
 class FtpTrafficServer:
     @classmethod
-    def createServer(cls, address, dispatcher):
-        return cls((address, 0), dispatcher)
+    def createServer(cls, address, port, dispatcher):
+        return cls((address, port), dispatcher)
     
     def __init__(self, address, dispatcher):
         self.count = 0

{capturemock-2.7.2 → capturemock-2.7.4}/capturemock/server.py

@@ -49,7 +49,8 @@ def startServer(rcFiles,
                 recordEditDir,
                 sutDirectory,
                 environment,
-                stderrFn):
+                stderrFn, 
+                port):
     cmdArgs = getServer() + [ "-m", str(mode) ]
     if rcFiles:
         cmdArgs += [ "--rcfiles", ",".join(rcFiles) ]
@@ -63,13 +64,22 @@ def startServer(rcFiles,
         if replayEditDir:
             cmdArgs += [ "-f", replayEditDir ]
 
+    if port:
+        cmdArgs += [ "-P", str(port) ]
+
     stderr = open(stderrFn, "w") if stderrFn else subprocess.PIPE
+    # Platform-specific process isolation, to avoid Ctrl-C killing the server
+    if sys.platform == "win32":
+        platform_kw = { "creationflags": subprocess.CREATE_NEW_PROCESS_GROUP }
+    else:
+        platform_kw = { "preexec_fn": os.setpgrp }
     return subprocess.Popen(cmdArgs,
                             env=environment.copy(),
                             universal_newlines=True,
                             cwd=sutDirectory,
                             stdout=subprocess.PIPE,
-                            stderr=stderr)
+                            stderr=stderr,
+                            **platform_kw)
 
 def stopServer(servAddr, protocol):
     if protocol == "http":
@@ -147,9 +157,9 @@ class ClassicTrafficServer:
     
 class ClassicTcpTrafficServer(ClassicTrafficServer, TCPServer):
     @classmethod
-    def createServer(cls, address, dispatcher):
+    def createServer(cls, address, port, dispatcher):
         ClassicTcpTrafficRequestHandler.dispatcher = dispatcher
-        return cls((address, 0), ClassicTcpTrafficRequestHandler, dispatcher.useThreads)
+        return cls((address, port), ClassicTcpTrafficRequestHandler, dispatcher.useThreads)
 
     def __init__(self, addrinfo, handlerClass, useThreads):
         ClassicTrafficServer.__init__(self)
@@ -179,18 +189,18 @@ class ClassicTcpTrafficServer(ClassicTrafficServer, TCPServer):
     
 class ClassicUdpTrafficServer(ClassicTrafficServer, UDPServer):
     @classmethod
-    def createServer(cls, ip, dispatcher):
+    def createServer(cls, ip, port, dispatcher):
         ClassicUdpTrafficRequestHandler.dispatcher = dispatcher
         broadcast = dispatcher.rcHandler.getboolean("broadcast", [ "general" ], False)
         if broadcast:
             # common pattern with UDP broadcasting
             cls.allow_reuse_address = True
-        return cls(ip, ClassicUdpTrafficRequestHandler, broadcast)
+        return cls(ip, port, ClassicUdpTrafficRequestHandler, broadcast)
 
-    def __init__(self, ip, handlerClass, broadcast):
+    def __init__(self, ip, port, handlerClass, broadcast):
         ClassicTrafficServer.__init__(self)
         bindHost = "0.0.0.0" if broadcast else ip
-        UDPServer.__init__(self, (bindHost, 0), handlerClass)
+        UDPServer.__init__(self, (bindHost, port), handlerClass)
         self.ip = ip
         clientservertraffic.ClientSocketTraffic.socketType = socket.SOCK_DGRAM
         clientservertraffic.ClientSocketTraffic.broadcast = broadcast
@@ -222,12 +232,14 @@ class ClassicTcpTrafficRequestHandler(StreamRequestHandler):
             self.wfile.write(("CAPTUREMOCK MISMATCH: " + str(e)).encode())
     
 class UdpSocketFile:
-    def __init__(self, sock, address):
-        self.socket = sock
+    def __init__(self, local_ip, address):
+        self.local_ip = local_ip
         self.address = address
         
     def write(self, data):
-        self.socket.sendto(data, self.address)
+        sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        sock.bind((self.local_ip, 0))
+        sock.sendto(data, self.address)
         
     def close(self):
         pass # don't close the socket!
@@ -244,7 +256,7 @@ class ClassicUdpTrafficRequestHandler(BaseRequestHandler):
         
     def handleText(self, text):
         self.dispatcher.diag.debug("Received incoming UDP request...\n" + text)
-        wfile = UdpSocketFile(self.request[1], self.client_address)
+        wfile = UdpSocketFile(self.dispatcher.server.ip, self.client_address)
         try:
             self.dispatcher.processText(text, wfile, self.requestNumber)
         except config.CaptureMockReplayError as e:
@@ -443,9 +455,9 @@ class HTTPTrafficHandler(BaseHTTPRequestHandler):
 
 class HTTPTrafficServer(HTTPServer):
     @classmethod
-    def createServer(cls, address, dispatcher):
+    def createServer(cls, address, port, dispatcher):
         HTTPTrafficHandler.dispatcher = dispatcher
-        return cls((address, 0))
+        return cls((address, port))
     
     def __init__(self, address):
         # Default value of 5 isn't very much...
@@ -484,8 +496,8 @@ class HTTPTrafficServer(HTTPServer):
 
 class XmlRpcTrafficServer(SimpleXMLRPCServer):
     @classmethod
-    def createServer(cls, address, dispatcher):
-        server = cls((address, 0), logRequests=False, use_builtin_types=True)
+    def createServer(cls, address, port, dispatcher):
+        server = cls((address, port), logRequests=False, use_builtin_types=True)
         server.register_instance(XmlRpcDispatchInstance(dispatcher))
         return server
 
@@ -809,15 +821,15 @@ class ServerDispatcher(ServerDispatcherBase):
     def __init__(self, options):
         ServerDispatcherBase.__init__(self, options)
         self.terminate = False
-        self.server = self.makeServer()
+        self.server = self.makeServer(options.port)
         address = self.server.getAddress()
         self.rcHandler.address = address
         sys.stdout.write(address + "\n") # Tell our caller, so they can tell the program being handled
         sys.stdout.flush()
     
-    def makeServer(self):
+    def makeServer(self, port):
         ipAddress = self.getIpAddress()
-        return self.serverClass.createServer(ipAddress, self)
+        return self.serverClass.createServer(ipAddress, port, self)
 
     def getIpAddress(self):
         # Code below can cause complications with VPNs etc. Default is local access only, sufficient in 99.9% of cases