Bug 1415781 part 1 - Fix test_display_mode tests for local run. r?heycam draft
authorXidorn Quan <me@upsuper.org>
Thu, 21 Dec 2017 11:51:37 +1100
changeset 719349 04d953f1be992b2b73b07900853be2db23d0b0fb
parent 719348 5ea3e9316d665bddabe00b85410bf6da083a5408
child 719350 60ffa1b2c34d714c9bb87555150ddb1fdfec8e8c
push id95231
push userxquan@mozilla.com
push dateFri, 12 Jan 2018 01:21:05 +0000
reviewersheycam
bugs1415781
milestone59.0a1
Bug 1415781 part 1 - Fix test_display_mode tests for local run. r?heycam MozReview-Commit-ID: DXysVpV6Lk1
layout/style/test/chrome/display_mode_reflow_iframe.html
layout/style/test/chrome/test_display_mode.html
layout/style/test/chrome/test_display_mode_reflow.html
layout/style/test/display_mode_reflow_iframe.html
layout/style/test/mochitest.ini
layout/style/test/moz.build
rename from layout/style/test/display_mode_reflow_iframe.html
rename to layout/style/test/chrome/display_mode_reflow_iframe.html
--- a/layout/style/test/chrome/test_display_mode.html
+++ b/layout/style/test/chrome/test_display_mode.html
@@ -95,17 +95,17 @@ add_task(async function() {
   setDisplayMode(Components.interfaces.nsIDocShell.DISPLAY_MODE_MINIMAL_UI);
   shouldApply("all and (display-mode: minimal-ui)");
   shouldNotApply("all and (display-mode: standalone)");
 });
   </script>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1104916">Mozilla Bug 1104916</a>
-<iframe id="subdoc" src="http://mochi.test:8888/tests/layout/style/test/media_queries_iframe.html"></iframe>
+<iframe id="subdoc" src="http://mochi.test:8888/tests/layout/style/test/chrome/media_queries_iframe.html"></iframe>
 <p id="display"></p>
 <div id="content" style="display: none">
 
 </div>
 <pre id="test">
 </pre>
 </body>
 </html>
--- a/layout/style/test/chrome/test_display_mode_reflow.html
+++ b/layout/style/test/chrome/test_display_mode_reflow.html
@@ -57,17 +57,17 @@ add_task(async function() {
   document.mozCancelFullScreen();
   await fullScreenExited;
   ok(offsetTop === secondDiv.offsetTop, "offset top returns to original value");
 });
   </script>
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1256084">Mozilla Bug 1256084</a>
-<iframe id="subdoc" src="http://mochi.test:8888/tests/layout/style/test/display_mode_reflow_iframe.html"></iframe>
+<iframe id="subdoc" src="http://mochi.test:8888/tests/layout/style/test/chrome/display_mode_reflow_iframe.html"></iframe>
 <p id="display"></p>
 <div id="content" style="display: none">
 
 </div>
 <pre id="test">
 </pre>
 </body>
 </html>
--- a/layout/style/test/mochitest.ini
+++ b/layout/style/test/mochitest.ini
@@ -3,17 +3,16 @@ support-files =
   animation_utils.js
   ccd-quirks.html
   ccd.sjs
   ccd-standards.html
   chrome/bug418986-2.js
   chrome/match.png
   chrome/mismatch.png
   descriptor_database.js
-  display_mode_reflow_iframe.html
   empty.html
   file_computed_style_bfcache_display_none.html
   file_computed_style_bfcache_display_none2.html
   media_queries_dynamic_xbl_binding.xml
   media_queries_dynamic_xbl_iframe.html
   media_queries_dynamic_xbl_style.css
   media_queries_iframe.html
   neverending_font_load.sjs
--- a/layout/style/test/moz.build
+++ b/layout/style/test/moz.build
@@ -30,17 +30,19 @@ HostSimplePrograms([
 MOCHITEST_MANIFESTS += [
     'mochitest.ini',
 ]
 XPCSHELL_TESTS_MANIFESTS += ['xpcshell.ini']
 BROWSER_CHROME_MANIFESTS += ['browser.ini']
 MOCHITEST_CHROME_MANIFESTS += ['chrome/chrome.ini']
 
 TEST_HARNESS_FILES.testing.mochitest.tests.layout.style.test.chrome += [
+    'chrome/display_mode_reflow_iframe.html',
     'chrome/moz_document_helper.html',
+    'media_queries_iframe.html',
 ]
 
 TEST_HARNESS_FILES.testing.mochitest.tests.layout.style.test['css-visited'] += [
     '/layout/reftests/css-visited/border-1-ref.html',
     '/layout/reftests/css-visited/border-1.html',
     '/layout/reftests/css-visited/border-2-ref.html',
     '/layout/reftests/css-visited/border-2a.html',
     '/layout/reftests/css-visited/border-2b.html',