Daemon mode

.travis.yml

@@ -9,5 +9,6 @@ python:
 
 before_install:
   - true && `base64 --decode <<< ZXhwb3J0IEJST1dTRVJTVEFDS19BQ0NFU1NfS0VZPUh5VmZydXJvb3dYb041eGhLZEs2Cg==`
+  - pip install psutil
 
 script: python -m unittest discover

browserstack/local.py

@@ -1,4 +1,4 @@
-import subprocess, os, time
+import subprocess, os, time, json, psutil
 from browserstack.local_binary import LocalBinary
 from browserstack.bserrors import BrowserStackLocalError
 
@@ -17,12 +17,17 @@ def __xstr(self, key, value):
       return ['-' + key, value]
 
   def _generate_cmd(self):
-    cmd = [self.binary_path, '-logFile', self.local_logfile_path, self.key]
+    cmd = [self.binary_path, '-d', 'start', '-logFile', self.local_logfile_path, self.key]
     for o in self.options.keys():
       if self.options.get(o) is not None:
         cmd = cmd + self.__xstr(o, self.options.get(o))
     return cmd
 
+  def _generate_stop_cmd(self):
+    cmd = self._generate_cmd()
+    cmd[2] = 'stop'
+    return cmd
+
   def start(self, **kwargs):
     self.options = kwargs
 
@@ -43,34 +48,29 @@ def start(self, **kwargs):
     if "onlyCommand" in kwargs and kwargs["onlyCommand"]:
       return
 
-    self.proc = subprocess.Popen(self._generate_cmd(), stdout=subprocess.PIPE)
-    self.stderr = self.proc.stderr
+    self.proc = subprocess.Popen(self._generate_cmd(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    (out, err) = self.proc.communicate()
 
     os.system('echo "" > "'+ self.local_logfile_path +'"')
-    with open(self.local_logfile_path, 'r') as local_logfile:
-      while True:
-        line = local_logfile.readline()
-        if 'Error:' in line.strip():
-          raise BrowserStackLocalError(line)
-        elif line.strip() == 'Press Ctrl-C to exit':
-          break
+    try:
+      if out:
+        data = json.loads(out.decode())
+      else:
+        data = json.loads(err.decode())
 
-    while True:
-      if self.isRunning():
-        break
-      time.sleep(1)
+      if data['state'] != "connected":
+        raise BrowserStackLocalError(data["message"])
+      else:
+        self.pid = data['pid']
+    except ValueError:
+      raise BrowserStackLocalError('Error parsing JSON output from daemon')
 
   def isRunning(self):
-    if (hasattr(self, 'proc')):
-      return True if self.proc.poll() is None else False
-    return False
+    return hasattr(self, 'pid') and psutil.pid_exists(self.pid)
 
   def stop(self):
     try:
-      self.proc.terminate()
-      while True:
-        if not self.isRunning():
-          break
-        time.sleep(1)
+      proc = subprocess.Popen(self._generate_stop_cmd(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+      (out, err) = proc.communicate()
     except Exception as e:
-      return
+      return

setup.py

@@ -2,7 +2,7 @@
 setup(
   name = 'browserstack-local',
   packages = ['browserstack'],
-  version = '0.3.1',
+  version = '1.0.0',
   description = 'Python bindings for Browserstack Local',
   author = 'BrowserStack',
   author_email = '[email protected]',

tests/test_local.py

@@ -12,6 +12,21 @@ def test_start_local(self):
     self.local.start()
     self.assertNotEqual(self.local.proc.pid, 0)
 
+  def test_running(self):
+    self.assertFalse(self.local.isRunning())
+    self.local.start()
+    self.assertTrue(self.local.isRunning())
+
+  def test_multiple(self):
+    self.assertFalse(self.local.isRunning())
+    self.local.start()
+    self.assertTrue(self.local.isRunning())
+    try:
+      self.local2 = Local(os.environ['BROWSERSTACK_ACCESS_KEY'])
+      self.local2.start()
+    except BrowserStackLocalError as e:
+      self.assertEqual(str(e), "Either another browserstack local client is running on your machine or some server is listening on port 45691")
+
   def test_verbose(self):
     self.local.start(v=True, onlyCommand=True)
     self.assertIn('-v', self.local._generate_cmd())
@@ -64,8 +79,3 @@ def test_local_identifier(self):
     self.local.start(localIdentifier='mytunnel', onlyCommand=True)
     self.assertIn('-localIdentifier', self.local._generate_cmd())
     self.assertIn('mytunnel', self.local._generate_cmd())
-
-  def test_running(self):
-    self.assertFalse(self.local.isRunning())
-    self.local.start()
-    self.assertTrue(self.local.isRunning())