From 81bbccece8680ac7b177c0e27a3e4f68b9ca1613 Mon Sep 17 00:00:00 2001 From: Nidhi Makhijani Date: Wed, 6 Apr 2016 19:13:40 +0530 Subject: [PATCH 1/2] force proxy --- browserstack/local.py | 4 +++- tests/test_local.py | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/browserstack/local.py b/browserstack/local.py index fb96117..8451f3f 100644 --- a/browserstack/local.py +++ b/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) diff --git a/tests/test_local.py b/tests/test_local.py index 11bd959..86c8052 100644 --- a/tests/test_local.py +++ b/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()) From e14ba908142435b19d528f9e8487c5fc65f3a6a5 Mon Sep 17 00:00:00 2001 From: Nidhi Makhijani Date: Wed, 6 Apr 2016 20:07:18 +0530 Subject: [PATCH 2/2] typo --- browserstack/local.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browserstack/local.py b/browserstack/local.py index 8451f3f..99ed64f 100644 --- a/browserstack/local.py +++ b/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', 'forceproxy' '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