From 264fda7592a078fe54df7990940c59ca56e9073c Mon Sep 17 00:00:00 2001 From: "Ubuntu 12.04 Devel" Date: Thu, 26 Dec 2013 15:01:23 -0500 Subject: [PATCH] Refixed issue with parsing desired capabilities Reapplied fix to handle colon within a value for the desired capabilities. This had been fixed but the bug was reintroduced somewhere. Added unittest to check for complex desired capabilities string. --- src/Selenium2Library/keywords/_browsermanagement.py | 2 +- test/unit/keywords/test_browsermanagement.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Selenium2Library/keywords/_browsermanagement.py b/src/Selenium2Library/keywords/_browsermanagement.py index 3e7834edd..b1271225f 100644 --- a/src/Selenium2Library/keywords/_browsermanagement.py +++ b/src/Selenium2Library/keywords/_browsermanagement.py @@ -570,7 +570,7 @@ def _parse_capabilities_string(self, capabilities_string): return desired_capabilities for cap in capabilities_string.split(","): - (key, value) = cap.split(":") + (key, value) = cap.split(":", 1) desired_capabilities[key.strip()] = value.strip() return desired_capabilities diff --git a/test/unit/keywords/test_browsermanagement.py b/test/unit/keywords/test_browsermanagement.py index 0e229192d..b0faf1871 100644 --- a/test/unit/keywords/test_browsermanagement.py +++ b/test/unit/keywords/test_browsermanagement.py @@ -52,6 +52,14 @@ def test_parse_capabilities_string(self): self.assertTrue("val2", capabilities["key2"]) self.assertTrue(2, len(capabilities)) + def test_parse_complex_capabilities_string(self): + bm = _BrowserManagementKeywords() + expected_caps = "proxyType:manual,httpProxy:IP:port" + capabilities = bm._parse_capabilities_string(expected_caps) + self.assertTrue("manual", capabilities["proxyType"]) + self.assertTrue("IP:port", capabilities["httpProxy"]) + self.assertTrue(2, len(capabilities)) + def test_create_remote_browser_with_desired_prefs(self): expected_caps = {"key1":"val1","key2":"val2"} self.verify_browser(webdriver.Remote, "chrome", remote="http://127.0.0.1/wd/hub",