summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/dom_checker/expected_failures_linux-file.txt16
-rw-r--r--chrome/test/data/dom_checker/expected_failures_mac-file.txt16
-rw-r--r--chrome/test/data/dom_checker/expected_failures_win-file.txt (renamed from chrome/test/data/dom_checker/expected_failures-file.txt)0
-rw-r--r--chrome/test/ui/dom_checker_uitest.cc10
4 files changed, 41 insertions, 1 deletions
diff --git a/chrome/test/data/dom_checker/expected_failures_linux-file.txt b/chrome/test/data/dom_checker/expected_failures_linux-file.txt
new file mode 100644
index 0000000..0e48ae4
--- /dev/null
+++ b/chrome/test/data/dom_checker/expected_failures_linux-file.txt
@@ -0,0 +1,16 @@
+# Expected failures when running from local disk.
+(blank).history.forward(0) call
+(blank).length read [value: 0]
+(blank).postMessage read [value: function () { [native code] }]
+(third-party).frames.length read [value: 2]
+(third-party).frames[0] probe [value: [object DOMWindow]]
+(third-party).history.forward(0) call
+(third-party).length read [value: 2]
+(third-party).postMessage read [value: function () { [native code] }]
+(third-party).window.length read [value: 2]
+(third-party).window[0] probe [value: [object DOMWindow]]
+document.domain = ''
+open() frame name lookup
+
+# Issue 38018
+(third-party).length read [value: 0]
diff --git a/chrome/test/data/dom_checker/expected_failures_mac-file.txt b/chrome/test/data/dom_checker/expected_failures_mac-file.txt
new file mode 100644
index 0000000..0e48ae4
--- /dev/null
+++ b/chrome/test/data/dom_checker/expected_failures_mac-file.txt
@@ -0,0 +1,16 @@
+# Expected failures when running from local disk.
+(blank).history.forward(0) call
+(blank).length read [value: 0]
+(blank).postMessage read [value: function () { [native code] }]
+(third-party).frames.length read [value: 2]
+(third-party).frames[0] probe [value: [object DOMWindow]]
+(third-party).history.forward(0) call
+(third-party).length read [value: 2]
+(third-party).postMessage read [value: function () { [native code] }]
+(third-party).window.length read [value: 2]
+(third-party).window[0] probe [value: [object DOMWindow]]
+document.domain = ''
+open() frame name lookup
+
+# Issue 38018
+(third-party).length read [value: 0]
diff --git a/chrome/test/data/dom_checker/expected_failures-file.txt b/chrome/test/data/dom_checker/expected_failures_win-file.txt
index 8abb808..8abb808 100644
--- a/chrome/test/data/dom_checker/expected_failures-file.txt
+++ b/chrome/test/data/dom_checker/expected_failures_win-file.txt
diff --git a/chrome/test/ui/dom_checker_uitest.cc b/chrome/test/ui/dom_checker_uitest.cc
index db28e07..2d5e2db 100644
--- a/chrome/test/ui/dom_checker_uitest.cc
+++ b/chrome/test/ui/dom_checker_uitest.cc
@@ -47,7 +47,15 @@ class DomCheckerTest : public UITest {
ResultsSet expected_failures, current_failures;
std::string failures_file = use_http ?
- "expected_failures-http.txt" : "expected_failures-file.txt";
+#if defined(OS_MACOSX)
+ "expected_failures_mac-http.txt" : "expected_failures_mac-file.txt";
+#elif defined(OS_LINUX)
+ "expected_failures_linux-http.txt" : "expected_failures_linux-file.txt";
+#elif defined(OS_WIN)
+ "expected_failures_win-http.txt" : "expected_failures_win-file.txt";
+#else
+ "" : "";
+#endif
GetExpectedFailures(failures_file, &expected_failures);