Bug 1286530 - Switch mozChromeNotifications mochitests to chrome r=fabrice draft
authorAlexandre Lissy <lissyx@lissyx.dyndns.org>
Tue, 03 May 2016 18:44:50 +0200
changeset 387081 48650bf33d05315558a88cb9e1e9a63d9fdfeb18
parent 387080 64b6132091e0906b4e5747d1a6e49751b7579f8b
child 525289 b4589e821a698045a00af4b46e13d643c81280b2
push id22895
push userbmo:lissyx+mozillians@lissyx.dyndns.org
push dateWed, 13 Jul 2016 12:57:10 +0000
reviewersfabrice
bugs1286530
milestone50.0a1
Bug 1286530 - Switch mozChromeNotifications mochitests to chrome r=fabrice MozReview-Commit-ID: EFmqrkGXjms Conflicts: dom/tests/mochitest/notification/mochitest.ini
dom/tests/mochitest/notification/chrome.ini
dom/tests/mochitest/notification/mochitest.ini
dom/tests/mochitest/notification/test_notification_noresend.html
dom/tests/moz.build
new file mode 100644
--- /dev/null
+++ b/dom/tests/mochitest/notification/chrome.ini
@@ -0,0 +1,8 @@
+[DEFAULT]
+
+support-files =
+  MockServices.js
+  NotificationTest.js
+
+[test_notification_noresend.html]
+skip-if = (toolkit == 'gonk') # Mochitest on Gonk registers an app manifest that messes with the logic
--- a/dom/tests/mochitest/notification/mochitest.ini
+++ b/dom/tests/mochitest/notification/mochitest.ini
@@ -4,11 +4,9 @@ support-files =
   MockServices.js
   NotificationTest.js
 
 [test_notification_basics.html]
 [test_notification_storage.html]
 [test_bug931307.html]
 skip-if = (os == 'android') # Bug 1258975 on android.
 [test_notification_resend.html]
-skip-if = (buildapp != 'b2g' && buildapp != 'mulet') || e10s # On e10s, faking the app seems to be failing
-[test_notification_noresend.html]
-skip-if = (toolkit == 'gonk') # Mochitest on Gonk registers an app manifest that messes with the logic
+skip-if = true ### Bug 1255339: blacklist because no more mozApps
--- a/dom/tests/mochitest/notification/test_notification_noresend.html
+++ b/dom/tests/mochitest/notification/test_notification_noresend.html
@@ -1,16 +1,16 @@
 <!DOCTYPE HTML>
 <html>
 <head>
   <title>Testing mozResendAllNotifications() resend behavior for Pages</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="MockServices.js"></script>
   <script type="text/javascript" src="NotificationTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css" />
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1159128">Bug 1159128</a>
 <p id="display"></p>
 <div id="content" style="display: none"></div>
 <pre id="test"></pre>
 <script type="text/javascript">
   var info = NotificationTest.info;
--- a/dom/tests/moz.build
+++ b/dom/tests/moz.build
@@ -31,16 +31,17 @@ MOCHITEST_MANIFESTS += [
 ]
 
 MOCHITEST_CHROME_MANIFESTS += [
     'mochitest/beacon/chrome.ini',
     'mochitest/chrome/chrome.ini',
     'mochitest/general/chrome.ini',
     'mochitest/geolocation/chrome.ini',
     'mochitest/localstorage/chrome.ini',
+    'mochitest/notification/chrome.ini',
     'mochitest/sessionstorage/chrome.ini',
     'mochitest/whatwg/chrome.ini',
 ]
 
 if CONFIG['MOZ_GAMEPAD']:
     MOCHITEST_MANIFESTS += [
         'mochitest/gamepad/mochitest.ini',
     ]