summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-06 15:17:21 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-06 15:17:21 +0000
commitbdad77610f75f2bf629d5ef2dac5a2241d40ca3e (patch)
tree040c17c0af9b506590ea183a032f7deff255aeb5
parent837363d0e6e29897d7f3c64a8e3ee3fd13a63267 (diff)
downloadchromium_src-bdad77610f75f2bf629d5ef2dac5a2241d40ca3e.zip
chromium_src-bdad77610f75f2bf629d5ef2dac5a2241d40ca3e.tar.gz
chromium_src-bdad77610f75f2bf629d5ef2dac5a2241d40ca3e.tar.bz2
Rebase tests to match our network layer, not CFNetwork
Review URL: http://codereview.chromium.org/40223 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11112 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/misc/window-dot-stop-expected.txt6
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/xmlhttprequest/abort-should-cancel-load-expected.txt3
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt7
3 files changed, 11 insertions, 5 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/misc/window-dot-stop-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/misc/window-dot-stop-expected.txt
new file mode 100644
index 0000000..bba1b5d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/misc/window-dot-stop-expected.txt
@@ -0,0 +1,6 @@
+http://127.0.0.1:8000/incremental/slow-utf8-text.pl - willSendRequest <WebRequest URL "http://127.0.0.1:8000/incremental/slow-utf8-text.pl">
+http://127.0.0.1:8000/incremental/slow-utf8-text.pl - didFailLoadingWithError <WebError code -3, failing URL "http://127.0.0.1:8000/incremental/slow-utf8-text.pl">
+<unknown> - didFailLoadingWithError <WebError code -3, failing URL "http://127.0.0.1:8000/misc/window-dot-stop.html">
+This tests for the successful use of window.stop()
+
+
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/xmlhttprequest/abort-should-cancel-load-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/xmlhttprequest/abort-should-cancel-load-expected.txt
new file mode 100644
index 0000000..c11e4df
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/xmlhttprequest/abort-should-cancel-load-expected.txt
@@ -0,0 +1,3 @@
+http://127.0.0.1:8000/xmlhttprequest/resources/endlessxml.php - willSendRequest <WebRequest URL "http://127.0.0.1:8000/xmlhttprequest/resources/endlessxml.php">
+http://127.0.0.1:8000/xmlhttprequest/resources/endlessxml.php - didFailLoadingWithError <WebError code -3, failing URL "http://127.0.0.1:8000/xmlhttprequest/resources/endlessxml.php">
+This tests that calling abort() on an XHR object stops the load, causing the relevant resource load delegates to be sent.
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 12966cf..1a06de6 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1254,14 +1254,11 @@ MAC : LayoutTests/fast/events/init-events.html = FAIL
// maybe we just need to update to this order?
MAC : LayoutTests/fast/events/drag-in-frames.html = FAIL
-// These two have a different object type in the dom dump?
+// These two have a different object type in the dom dump. Plugin-related.
+// Ignored on Win/Linux because they rely on QT to provide a TIFF decoder.
MAC : LayoutTests/fast/images/embed-image.html = FAIL
MAC : LayoutTests/fast/images/object-image.html = FAIL
-// Rebase for our network stack?
-MAC : LayoutTests/http/tests/misc/window-dot-stop.html = FAIL
-MAC : LayoutTests/http/tests/xmlhttprequest/abort-should-cancel-load.html = FAIL
-
// Some times it fails because the animation starts before the first dom dump
// so the text doesn't match.
MAC : LayoutTests/svg/hixie/perf/007.xml = FAIL PASS