From 4804cd4b5626285f975d469cbebdf2f756708882 Mon Sep 17 00:00:00 2001 From: Christoph Kerschbaumer Date: Sun, 4 Jan 2015 22:02:17 -0800 Subject: [PATCH] Bug 1117650 - Part 2 - Move all MixedContentBlocker tests into dom/security/test (r=tanvi) --HG-- rename : dom/base/test/mixedcontentblocker/bug803225_test_mailto.html => dom/security/test/mixedcontentblocker/file_bug803225_test_mailto.html rename : dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation.html => dom/security/test/mixedcontentblocker/file_frameNavigation.html rename : dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_blankTarget.html => dom/security/test/mixedcontentblocker/file_frameNavigation_blankTarget.html rename : dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_grandchild.html => dom/security/test/mixedcontentblocker/file_frameNavigation_grandchild.html rename : dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html => dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html rename : dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure.html => dom/security/test/mixedcontentblocker/file_frameNavigation_secure.html rename : dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure_grandchild.html => dom/security/test/mixedcontentblocker/file_frameNavigation_secure_grandchild.html rename : dom/base/test/mixedcontentblocker/file_mixed_content_main.html => dom/security/test/mixedcontentblocker/file_main.html rename : dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225.html => dom/security/test/mixedcontentblocker/file_main_bug803225.html rename : dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225_websocket_wsh.py => dom/security/test/mixedcontentblocker/file_main_bug803225_websocket_wsh.py rename : dom/base/test/mixedcontentblocker/file_mixed_content_server.sjs => dom/security/test/mixedcontentblocker/file_server.sjs rename : dom/base/test/mixedcontentblocker/mochitest.ini => dom/security/test/mixedcontentblocker/mochitest.ini rename : dom/base/test/mixedcontentblocker/test_mixed_content_blocker_bug803225.html => dom/security/test/mixedcontentblocker/test_bug803225.html rename : dom/base/test/mixedcontentblocker/test_mixed_content_blocker_frameNavigation.html => dom/security/test/mixedcontentblocker/test_frameNavigation.html rename : dom/base/test/mixedcontentblocker/test_mixed_content_blocker.html => dom/security/test/mixedcontentblocker/test_main.html --- .../test/mixedcontentblocker/mochitest.ini | 20 ------------------- dom/base/test/moz.build | 1 - .../file_bug803225_test_mailto.html} | 0 .../file_frameNavigation.html} | 6 +++--- .../file_frameNavigation_blankTarget.html} | 2 +- .../file_frameNavigation_grandchild.html} | 4 ++-- .../file_frameNavigation_innermost.html} | 8 ++++---- .../file_frameNavigation_secure.html} | 6 +++--- ...le_frameNavigation_secure_grandchild.html} | 4 ++-- .../test/mixedcontentblocker/file_main.html} | 2 +- .../file_main_bug803225.html} | 4 ++-- .../file_main_bug803225_websocket_wsh.py} | 0 .../test/mixedcontentblocker/file_server.sjs} | 0 .../test/mixedcontentblocker/mochitest.ini | 20 +++++++++++++++++++ .../mixedcontentblocker/test_bug803225.html} | 4 ++-- .../test_frameNavigation.html} | 6 +++--- .../test/mixedcontentblocker/test_main.html} | 2 +- dom/security/test/moz.build | 1 + 18 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 dom/base/test/mixedcontentblocker/mochitest.ini rename dom/{base/test/mixedcontentblocker/bug803225_test_mailto.html => security/test/mixedcontentblocker/file_bug803225_test_mailto.html} (100%) rename dom/{base/test/mixedcontentblocker/file_mixed_content_frameNavigation.html => security/test/mixedcontentblocker/file_frameNavigation.html} (85%) rename dom/{base/test/mixedcontentblocker/file_mixed_content_frameNavigation_blankTarget.html => security/test/mixedcontentblocker/file_frameNavigation_blankTarget.html} (84%) rename dom/{base/test/mixedcontentblocker/file_mixed_content_frameNavigation_grandchild.html => security/test/mixedcontentblocker/file_frameNavigation_grandchild.html} (81%) rename dom/{base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html => security/test/mixedcontentblocker/file_frameNavigation_innermost.html} (76%) rename dom/{base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure.html => security/test/mixedcontentblocker/file_frameNavigation_secure.html} (84%) rename dom/{base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure_grandchild.html => security/test/mixedcontentblocker/file_frameNavigation_secure_grandchild.html} (84%) rename dom/{base/test/mixedcontentblocker/file_mixed_content_main.html => security/test/mixedcontentblocker/file_main.html} (98%) rename dom/{base/test/mixedcontentblocker/file_mixed_content_main_bug803225.html => security/test/mixedcontentblocker/file_main_bug803225.html} (96%) rename dom/{base/test/mixedcontentblocker/file_mixed_content_main_bug803225_websocket_wsh.py => security/test/mixedcontentblocker/file_main_bug803225_websocket_wsh.py} (100%) rename dom/{base/test/mixedcontentblocker/file_mixed_content_server.sjs => security/test/mixedcontentblocker/file_server.sjs} (100%) create mode 100644 dom/security/test/mixedcontentblocker/mochitest.ini rename dom/{base/test/mixedcontentblocker/test_mixed_content_blocker_bug803225.html => security/test/mixedcontentblocker/test_bug803225.html} (95%) rename dom/{base/test/mixedcontentblocker/test_mixed_content_blocker_frameNavigation.html => security/test/mixedcontentblocker/test_frameNavigation.html} (91%) rename dom/{base/test/mixedcontentblocker/test_mixed_content_blocker.html => security/test/mixedcontentblocker/test_main.html} (98%) diff --git a/dom/base/test/mixedcontentblocker/mochitest.ini b/dom/base/test/mixedcontentblocker/mochitest.ini deleted file mode 100644 index 82502b2976dc..000000000000 --- a/dom/base/test/mixedcontentblocker/mochitest.ini +++ /dev/null @@ -1,20 +0,0 @@ -[DEFAULT] -support-files = - bug803225_test_mailto.html - file_mixed_content_frameNavigation.html - file_mixed_content_frameNavigation_blankTarget.html - file_mixed_content_frameNavigation_grandchild.html - file_mixed_content_frameNavigation_innermost.html - file_mixed_content_frameNavigation_secure.html - file_mixed_content_frameNavigation_secure_grandchild.html - file_mixed_content_main.html - file_mixed_content_main_bug803225.html - file_mixed_content_main_bug803225_websocket_wsh.py - file_mixed_content_server.sjs - -[test_mixed_content_blocker.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED -[test_mixed_content_blocker_bug803225.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED -[test_mixed_content_blocker_frameNavigation.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED diff --git a/dom/base/test/moz.build b/dom/base/test/moz.build index d510421d738d..14d8f06d5ebe 100644 --- a/dom/base/test/moz.build +++ b/dom/base/test/moz.build @@ -17,7 +17,6 @@ GeckoCppUnitTests([ MOCHITEST_MANIFESTS += [ 'chrome/mochitest.ini', - 'mixedcontentblocker/mochitest.ini', 'mochitest.ini', 'websocket_hybi/mochitest.ini', ] diff --git a/dom/base/test/mixedcontentblocker/bug803225_test_mailto.html b/dom/security/test/mixedcontentblocker/file_bug803225_test_mailto.html similarity index 100% rename from dom/base/test/mixedcontentblocker/bug803225_test_mailto.html rename to dom/security/test/mixedcontentblocker/file_bug803225_test_mailto.html diff --git a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation.html b/dom/security/test/mixedcontentblocker/file_frameNavigation.html similarity index 85% rename from dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation.html rename to dom/security/test/mixedcontentblocker/file_frameNavigation.html index 36761cb190ca..fd9ea23178e1 100644 --- a/dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation.html +++ b/dom/security/test/mixedcontentblocker/file_frameNavigation.html @@ -12,7 +12,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=840388