Merge pull request #68 from Dudi119/Development

cppkin test will use now random port.

Author: dulikvor

tests/server.py

@@ -1,5 +1,7 @@
 from bottle import Bottle, ServerAdapter
 from wsgiref.simple_server import make_server
+import socket
+from contextlib import closing
 
 class WSGIRefServerStoppable(ServerAdapter):
     def __init__(self, host, port, **options):
@@ -11,4 +13,10 @@ def run(self, handler):
         self._server.serve_forever()
 
     def stop(self):
-        self._server.shutdown()
+        self._server.shutdown()
+
+    @staticmethod
+    def findFreePort():
+        with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as s:
+            s.bind(('', 0))
+            return s.getsockname()[1]

tests/tests.py

@@ -1,4 +1,5 @@
 from zipkinStubServer import ServerGuard, ZipkinStubServer
+from server import WSGIRefServerStoppable
 import _cppkin
 from _cppkin import Trace, CppkinParams
 import unittest
@@ -42,9 +43,11 @@ def runTest(self):
         self.assertEqual(spans[0].parentId, spans[1].id, "Span parent id dosn't match trace's id {0} != {1}".format(spans[0].parentId, spans[1].id))
 
 def main():
+    port = WSGIRefServerStoppable.findFreePort()
+
     params = CppkinParams()
     params.add_str(_cppkin.HOST_ADDRESS, "127.0.0.1")
-    params.add_int(_cppkin.PORT, 9411)
+    params.add_int(_cppkin.PORT, port)
     params.add_str(_cppkin.SERVICE_NAME, "cppkinTest")
     params.add_bool(_cppkin.DEBUG, True)
     params.add_str(_cppkin.TRANSPORT_TYPE, "Http Transport")
@@ -54,7 +57,7 @@ def main():
 
     global outQueue
     global startEvent
-    server = ZipkinStubServer()
+    server = ZipkinStubServer(port)
     outQueue = Queue()
     startEvent = Event()
     with ServerGuard(ZipkinStubServer.spawn, server, outQueue, startEvent):