Merge pull request AutomatedTester#3 from santiycr/master

Several improvements to the library

Author: AutomatedTester

browsermobproxy/server.py

@@ -1,7 +1,8 @@
+import os
 from subprocess import Popen, PIPE, STDOUT
 import socket
 import time
-
+import platform
 from client import Client
 
 
@@ -13,48 +14,68 @@ def __init__(self, path, options={}):
 
         :Args:
          - path : Path to the browsermob proxy batch file
-         - options : Dictionary that can hold the port. More items will be added in the future.
+         - options : Dictionary that can hold the port.
+                     More items will be added in the future.
                      This defaults to an empty dictionary
         """
+        if platform.system() == 'Windows':
+            if not path.endswith('.bat'):
+                path += '.bat'
+
+        if not os.path.isfile(path):
+            raise Exception("Browsermob-Proxy binary couldn't be found in path"
+                            " provided: %s" % path)
+
         self.path = path
-        self.port = options['port'] if options.has_key('port') else 8080
-        self.command = ['sh', path, '--port=%s' % self.port]
+        self.port = options.get('port', 8080)
+        self.process = None
+
+        if platform.system() == 'Darwin':
+            self.command = ['sh']
+        else:
+            self.command = []
+        self.command += [path, '--port=%s' % self.port]
 
     def start(self):
         """
-        This will start the browsermob proxy and then wait until it can interact with it 
+        This will start the browsermob proxy and then wait until it can
+        interact with it
         """
         self.process = Popen(self.command, stdout=PIPE, stderr=STDOUT)
         count = 0
         while not self._is_listening():
-            time.sleep(0.1)
+            time.sleep(0.5)
             count += 1
-            if count == 30:
+            if count == 60:
+                self.stop()
                 raise Exception("Can't connect to Browsermob-Proxy")
 
     def stop(self):
         """
         This will stop the process running the proxy
         """
+        if self.process.poll() != None:
+            return
+
         try:
-            if self.process:
-                self.process.kill()
-                self.process.wait()
+            self.process.kill()
+            self.process.wait()
         except AttributeError:
             # kill may not be available under windows environment
             pass
 
     @property
     def url(self):
         """
-        Gets the url that the proxy is running on. This is not the URL clients should connect to.
+        Gets the url that the proxy is running on. This is not the URL clients
+        should connect to.
         """
         return "http://localhost:%d" % self.port
 
-    @property
     def create_proxy(self):
         """
-        Gets a client class that allow to set all the proxy details that you may need to.
+        Gets a client class that allow to set all the proxy details that you
+        may need to.
         """
         client = Client(self.url)
         return client
@@ -68,4 +89,3 @@ def _is_listening(self):
             return True
         except socket.error:
             return False
-