From df9476380b48353f9dcbaa6504ba468f4ca70edf Mon Sep 17 00:00:00 2001
From: Nigel Babu <nigelbabu@gmail.com>
Date: Thu, 10 Sep 2015 14:09:51 +0530
Subject: [PATCH] Backed out changeset 6f01338ecce9 (bug 1186833) for web
 platform test bustage

---
 ...same-scope-different-script-url.https.html.ini |  9 +++++++++
 ...ter-same-scope-different-script-url.https.html | 15 ++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 testing/web-platform/mozilla/meta/service-workers/service-worker/register-same-scope-different-script-url.https.html.ini

diff --git a/testing/web-platform/mozilla/meta/service-workers/service-worker/register-same-scope-different-script-url.https.html.ini b/testing/web-platform/mozilla/meta/service-workers/service-worker/register-same-scope-different-script-url.https.html.ini
new file mode 100644
index 00000000000..472ae2ae725
--- /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
+
diff --git 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
index 445be740951..6eb00f3071a 100644
--- 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
@@ -84,17 +84,10 @@ async_test(function(t) {
       .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() {