Merge pull request #4 from browserstack/force_proxy

Force proxy

Author: tr4n2uil

browserstack/local.py

@@ -18,7 +18,7 @@ def __xstr(self, obj):
     return str(obj)
 
   def _generate_cmd(self):
-    options_order = ['logfile_flag', 'logfile_path', 'folder_flag', 'key', 'folder_path', 'forcelocal', 'local_identifier', 'only', 'only_automate', 'proxy_host', 'proxy_port', 'proxy_user', 'proxy_pass', 'force', 'verbose', 'hosts']
+    options_order = ['logfile_flag', 'logfile_path', 'folder_flag', 'key', 'folder_path', 'forcelocal', 'local_identifier', 'only', 'only_automate', 'proxy_host', 'proxy_port', 'proxy_user', 'proxy_pass', 'forceproxy', 'force', 'verbose', 'hosts']
     cmd = [self.__xstr(self.options.get(o)) for o in options_order if self.options.get(o) is not None]
     return [self.binary_path] + cmd
 
@@ -82,6 +82,8 @@ def __add_arg(self, key, value):
       self.options['proxy_pass'] = '-proxyPass ' + str(value)
     elif key == 'hosts':
       self.options['hosts'] = str(value)
+    elif key == 'forceproxy' and value:
+      self.options['forceproxy'] = '-forceproxy'
     elif key == 'logfile':
       self.options['logfile_flag'] = '-logFile'
       self.options['logfile'] = str(value)

tests/test_local.py

@@ -40,6 +40,10 @@ def test_proxy(self):
     self.assertIn('-proxyUser hello', self.local._generate_cmd())
     self.assertIn('-proxyPass test123', self.local._generate_cmd())
 
+  def test_force_proxy(self):
+    self.local.start(forceproxy=True, onlyCommand=True)
+    self.assertIn('-forceproxy', self.local._generate_cmd())
+
   def test_local_identifier(self):
     self.local.start(localIdentifier='mytunnel', onlyCommand=True)
     self.assertIn('-localIdentifier mytunnel', self.local._generate_cmd())