summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xwebkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-missing-file-exception-expected.txt8
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 10 insertions, 1 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-missing-file-exception-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-missing-file-exception-expected.txt
new file mode 100755
index 0000000..05b8ef2
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-missing-file-exception-expected.txt
@@ -0,0 +1,8 @@
+This test checks that no exception is raised when getting a 404 HTTP response - that's success from XHR point of view.
+
+PASS: No exception.
+readyState: 4 (number)
+responseText: Non-empty (string)
+responseXML: null (object)
+status: 404 (number)
+statusText: Not Found (string)
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 856ee7f..58c64c8 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1873,7 +1873,8 @@ BUG9156 MAC LINUX WIN : LayoutTests/fast/js/console-non-string-values.html = FAI
BUG9161 MAC LINUX WIN : LayoutTests/fast/forms/basic-textareas.html = FAIL
BUG9163 LINUX WIN : LayoutTests/http/tests/xmlhttprequest/access-control-basic-whitelist-request-headers.html = FAIL
BUG9163 MAC : LayoutTests/http/tests/xmlhttprequest/access-control-basic-whitelist-request-headers.html = FAIL TIMEOUT
-BUG9163 MAC LINUX WIN : LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-missing-file-exception.html = FAIL
+// Being fixed upstream for Windows/Linux by jparent.
+BUG9163 LINUX WIN : LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-missing-file-exception.html = FAIL
// Unknown what change caused these to fail.
// Merge 41709:41733