WebDriver: test imported/w3c/webdriver/tests/sessions/new_session/merge.py::test_merg...
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 25 Jan 2018 13:51:11 +0000 (13:51 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 25 Jan 2018 13:51:11 +0000 (13:51 +0000)
https://bugs.webkit.org/show_bug.cgi?id=181984

Reviewed by Carlos Alberto Lopez Perez.

Source/WebDriver:

Platform name is expected to be lower case, so do not compre ignoring case.

Fixes: imported/w3c/webdriver/tests/sessions/new_session/merge.py::test_merge_platformName

* WebDriverService.cpp:
(WebDriver::WebDriverService::matchCapabilities const):

WebDriverTests:

Remove expectations for imported/w3c/webdriver/tests/sessions/new_session/merge.py::test_merge_platformName.

* TestExpectations.json:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@227602 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebDriver/ChangeLog
Source/WebDriver/WebDriverService.cpp
WebDriverTests/ChangeLog
WebDriverTests/TestExpectations.json

index 4823dce..57c5bff 100644 (file)
@@ -1,3 +1,17 @@
+2018-01-25  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        WebDriver: test imported/w3c/webdriver/tests/sessions/new_session/merge.py::test_merge_platformName fails
+        https://bugs.webkit.org/show_bug.cgi?id=181984
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        Platform name is expected to be lower case, so do not compre ignoring case.
+
+        Fixes: imported/w3c/webdriver/tests/sessions/new_session/merge.py::test_merge_platformName
+
+        * WebDriverService.cpp:
+        (WebDriver::WebDriverService::matchCapabilities const):
+
 2018-01-23  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         WebDriver: several tests in imported/w3c/webdriver/tests/sessions/new_session/merge.py are failing
index 68ef921..c19c9ee 100644 (file)
@@ -487,7 +487,7 @@ RefPtr<JSON::Object> WebDriverService::matchCapabilities(const JSON::Object& mer
         } else if (it->key == "platformName" && platformCapabilities.platformName) {
             String platformName;
             it->value->asString(platformName);
-            if (!equalLettersIgnoringASCIICase(platformName, "any") && !equalIgnoringASCIICase(platformCapabilities.platformName.value(), platformName)) {
+            if (!equalLettersIgnoringASCIICase(platformName, "any") && platformCapabilities.platformName.value() != platformName) {
                 errorString = makeString("expected platformName ", platformCapabilities.platformName.value(), " but got ", platformName);
                 return nullptr;
             }
index 37c5ff0..5e232c0 100644 (file)
@@ -1,3 +1,14 @@
+2018-01-25  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        WebDriver: test imported/w3c/webdriver/tests/sessions/new_session/merge.py::test_merge_platformName fails
+        https://bugs.webkit.org/show_bug.cgi?id=181984
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        Remove expectations for imported/w3c/webdriver/tests/sessions/new_session/merge.py::test_merge_platformName.
+
+        * TestExpectations.json:
+
 2018-01-23  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         WebDriver: several tests in imported/w3c/webdriver/tests/sessions/new_session/merge.py are failing
index 1bfa71c..f527013 100644 (file)
     },
     "imported/w3c/webdriver/tests/sessions/new_session/merge.py": {
         "subtests": {
-            "test_merge_platformName": {
-                "expected": {"all": {"status": ["FAIL"], "bug": "webkit.org/b/181984"}}
-            },
             "test_merge_browserName": {
                 "expected": {"all": {"status": ["FAIL"], "bug": "webkit.org/b/181985"}}
             }