Merge pull request #19 from platinummonkey/issue-15

addresses #15 by adding a check for wiremock health status

Author: platinummonkey

wiremock/server/server.py

@@ -4,6 +4,8 @@
 import socket
 
 import time
+
+import requests
 from pkg_resources import resource_filename
 from subprocess import Popen, PIPE, STDOUT
 
@@ -15,12 +17,13 @@ class WireMockServer(object):
     DEFAULT_JAVA = "java"  # Assume java in PATH
     DEFAULT_JAR = resource_filename("wiremock", "server/wiremock-standalone-2.6.0.jar")
 
-    def __init__(self, java_path=DEFAULT_JAVA, jar_path=DEFAULT_JAR):
+    def __init__(self, java_path=DEFAULT_JAVA, jar_path=DEFAULT_JAR, port=None, max_attempts=10):
         self.java_path = java_path
         self.jar_path = jar_path
-        self.port = self._get_free_port()
+        self.port = port or self._get_free_port()
         self.__subprocess = None
         self.__running = False
+        self.max_attempts = max_attempts
 
     def __enter__(self):
         self.start()
@@ -50,6 +53,20 @@ def start(self):
                 "\n".join(["returncode: {}".format(self.__subprocess.returncode), "stdout:", str(self.__subprocess.stdout.read())])
             )
 
+        # Call the /__admin endpoint as a check for running state
+        attempts = 0
+        success = False
+        while attempts < self.max_attempts:
+            attempts += 1
+            resp = requests.get("http://localhost:{}/__admin".format(self.port))
+            if resp.status_code == 200:
+                success = True
+                break
+            time.sleep(0.25)
+
+        if not success:
+            raise WireMockServerNotStartedError("unable to get a successful GET http://localhost:{}/__admin response".format(self.port))
+
         atexit.register(self.stop, raise_on_error=False)
         self.__running = True
 

wiremock/tests/server_tests/server_tests.py

@@ -4,6 +4,7 @@
 import unittest
 from subprocess import STDOUT, PIPE
 
+import responses
 from mock import patch, DEFAULT
 from pkg_resources import resource_filename
 
@@ -56,7 +57,11 @@ def test_get_free_port(self, mock_socket):
     @attr("unit", "server")
     @patch("wiremock.server.server.atexit")
     @patch("wiremock.server.server.Popen")
+    @responses.activate
     def test_start(self, Popen, atexit):
+        # mock healthy endpoint
+        responses.add(responses.GET, "http://localhost:{}/__admin".format(self.wm.port), json=[], status=200)
+
         def poll():
             Popen.return_value.returncode = None
             return None