Bug 1214362 - Enable DOM push mochi and xpcshell tests on Fennec. r?dragana
authorNick Alexander <nalexander@mozilla.com>
Tue, 13 Oct 2015 14:33:16 -0700
changeset 326866 03e770c55c12514acec5fcc92a355445fe52b934
parent 326865 f07c956c84eae98d012b0f16293464d5779bbd57
child 326867 3150c768471cf5800888c009a0f3ed8d752e7038
push id10169
push userdminor@mozilla.com
push dateThu, 28 Jan 2016 13:10:48 +0000
reviewersdragana
bugs1214362
milestone45.0a1
Bug 1214362 - Enable DOM push mochi and xpcshell tests on Fennec. r?dragana
dom/push/test/mochitest.ini
dom/push/test/xpcshell/xpcshell.ini
--- a/dom/push/test/mochitest.ini
+++ b/dom/push/test/mochitest.ini
@@ -1,30 +1,22 @@
 [DEFAULT]
 subsuite = push
 support-files =
   worker.js
   push-server.sjs
   frame.html
   webpush.js
   lifetime_worker.js
+skip-if = buildapp == "b2gdroid" || toolkit == "gonk"
 
 [test_has_permissions.html]
-skip-if = os == "android" || toolkit == "gonk"
 [test_permissions.html]
-skip-if = os == "android" || toolkit == "gonk"
 [test_register.html]
-skip-if = os == "android" || toolkit == "gonk"
 [test_multiple_register.html]
-skip-if = os == "android" || toolkit == "gonk"
 [test_multiple_register_during_service_activation.html]
-skip-if = os == "android" || toolkit == "gonk"
 [test_unregister.html]
-skip-if = os == "android" || toolkit == "gonk"
 [test_multiple_register_different_scope.html]
-skip-if = os == "android" || toolkit == "gonk"
 [test_data.html]
-skip-if = os == "android" || toolkit == "gonk"
 # Disabled for too many intermittent failures (bug 1164432)
 #  [test_try_registering_offline_disabled.html]
 #  skip-if = os == "android" || toolkit == "gonk"
 [test_serviceworker_lifetime.html]
-skip-if = os == "android" || toolkit == "gonk"
--- a/dom/push/test/xpcshell/xpcshell.ini
+++ b/dom/push/test/xpcshell/xpcshell.ini
@@ -1,13 +1,13 @@
 [DEFAULT]
 head = head.js head-http2.js
 tail =
 # Push notifications and alarms are currently disabled on Android.
-skip-if = toolkit == 'android'
+skip-if = buildapp == "b2gdroid"
 
 [test_clear_origin_data.js]
 [test_drop_expired.js]
 [test_notification_ack.js]
 [test_notification_data.js]
 [test_notification_duplicate.js]
 [test_notification_error.js]
 [test_notification_incomplete.js]