Backed out changeset 6f01338ecce9 (bug 1186833) for web platform test bustage
authorNigel Babu <nigelbabu@gmail.com>
Thu, 10 Sep 2015 14:09:51 +0530
changeset 294357 63f9f2c908303da13f2ab8f19c35d7010ed31a58
parent 294356 e55283c9b6a08e788c5f58196cf551c6674a72be
child 294358 90f84f2af43ec3d1b63ca1aec8ad84b3368dc5f2
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1186833
milestone43.0a1
backs out6f01338ecce921c41bdaf8ea3e24abdec0866559
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 6f01338ecce9 (bug 1186833) for web platform test bustage
testing/web-platform/mozilla/meta/service-workers/service-worker/register-same-scope-different-script-url.https.html.ini
testing/web-platform/mozilla/tests/service-workers/service-worker/register-same-scope-different-script-url.https.html
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/register-same-scope-different-script-url.https.html.ini
@@ -0,0 +1,9 @@
+[register-same-scope-different-script-url.https.html]
+  type: testharness
+  expected: TIMEOUT
+  [Register then register new script URL]
+    expected: TIMEOUT
+
+  [Register same-scope new script url effect on controller]
+    expected: TIMEOUT
+
--- a/testing/web-platform/mozilla/tests/service-workers/service-worker/register-same-scope-different-script-url.https.html
+++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/register-same-scope-different-script-url.https.html
@@ -79,27 +79,20 @@ async_test(function(t) {
           assert_equals(registration.active.scriptURL, script1,
                         'on second register, the first script should be ' +
                         'active');
           return wait_for_state(t, registration.installing, 'installed');
         })
       .then(function() {
           assert_equals(registration.installing, null,
                         'on installed, installing should be null');
-          // Since the registration is not controlling any document, the new
-          // worker can immediately transition to active.
-          if (registration.waiting) {
-            assert_equals(registration.waiting.scriptURL, script2,
-                          'on installed, the second script may still be waiting');
-            assert_equals(registration.active.scriptURL, script1,
-                          'on installed, the first script may be active');
-          } else {
-            assert_equals(registration.active.scriptURL, script2,
-                          'on installed, the second script may be active');
-          }
+          assert_equals(registration.waiting.scriptURL, script2,
+                        'on installed, the second script should be waiting');
+          assert_equals(registration.active.scriptURL, script1,
+                        'on installed, the first script should be active');
           return registration.unregister();
         })
       .then(function() {
           t.done();
         })
       .catch(unreached_rejection(t));
   }, 'Register then register new script URL');