From 4c38bec7d9fbf6a81d9af56797f58e87d7e64ecb Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Fri, 13 Jan 2017 14:14:47 +0100
Subject: [PATCH] Fix 096.html and remove 098.html

Deferred scripts should have all ran before DOMContentLoaded is fired.
The removed script was a duplicate.
---
 tests/wpt/metadata/MANIFEST.json              |  4 ++-
 .../Opera/script_scheduling/096.html.ini      |  5 ----
 .../Opera/script_scheduling/098.html.ini      |  5 ----
 .../Opera/script_scheduling/096.html          | 24 +++++++++++-------
 .../Opera/script_scheduling/098.html          | 25 -------------------
 5 files changed, 18 insertions(+), 45 deletions(-)
 delete mode 100644 tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/096.html.ini
 delete mode 100644 tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/098.html.ini
 delete mode 100644 tests/wpt/web-platform-tests/old-tests/submission/Opera/script_scheduling/098.html

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 2653ba15068..3035761923a 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -45843,7 +45843,9 @@
     ]
   },
   "local_changes": {
-    "deleted": [],
+    "deleted": [
+      "old-tests/submission/Opera/script_scheduling/098.html"
+    ],
     "deleted_reftests": {},
     "items": {
       "testharness": {
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/096.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/096.html.ini
deleted file mode 100644
index 7647c26e9f9..00000000000
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/096.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[096.html]
-  type: testharness
-  [ scheduler: defer script added from document.write relative to DOMContentLoaded]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/098.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/098.html.ini
deleted file mode 100644
index 5b0aa1e5e0c..00000000000
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/098.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[098.html]
-  type: testharness
-  [ scheduler: defer script added from document.write]
-    expected: FAIL
-
diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Opera/script_scheduling/096.html b/tests/wpt/web-platform-tests/old-tests/submission/Opera/script_scheduling/096.html
index d5e1e8b460f..32d9baf0c96 100644
--- a/tests/wpt/web-platform-tests/old-tests/submission/Opera/script_scheduling/096.html
+++ b/tests/wpt/web-platform-tests/old-tests/submission/Opera/script_scheduling/096.html
@@ -9,16 +9,22 @@
 
 	<div id="log">FAILED (This TC requires JavaScript enabled)</div>
 
-        <script>
-          log("inline script #1");
-          document.write("<script defer src='scripts/include-1.js'><\/script>")
-        </script>
+  <script>
+    log("inline script #1");
+    document.write("<script defer src='scripts/include-1.js'><\/script>")
+  </script>
 	<script>
-          log("inline script #2");
-          var t = async_test();
+    log("inline script #2");
+    var t = async_test();
 
-          addEventListener("DOMContentLoaded", t.step_func(function() {assert_array_equals(eventOrder, ["inline script #1", "inline script #2"])}), false);
+    addEventListener("DOMContentLoaded", t.step_func(function() {
+      assert_array_equals(eventOrder, ["inline script #1", "inline script #2", "external script #1"]);
+      log("inline script #3");
+    }), false);
 
-          onload = t.step_func(function() {assert_array_equals(eventOrder, ["inline script #1", "inline script #2", "external script #1"]); t.done();});
-        </script>
+    onload = t.step_func(function() {
+      assert_array_equals(eventOrder, ["inline script #1", "inline script #2", "external script #1", "inline script #3"]);
+      t.done();
+    });
+  </script>
 </body></html>
diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Opera/script_scheduling/098.html b/tests/wpt/web-platform-tests/old-tests/submission/Opera/script_scheduling/098.html
deleted file mode 100644
index 2d421a8a37f..00000000000
--- a/tests/wpt/web-platform-tests/old-tests/submission/Opera/script_scheduling/098.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-	<title> scheduler: defer script added from document.write</title>
-	<script src="/resources/testharness.js"></script>
-	<script src="/resources/testharnessreport.js"></script>
-	<script src="testlib/testlib.js"></script>
-</head>
-<body>
-
-	<div id="log">FAILED (This TC requires JavaScript enabled)</div>
-
-        <script>
-          log("inline script #1");
-          document.write("<script defer src='scripts/include-1.js'><\/script>")
-        </script>
-	<script>
-          log("inline script #2");
-          var t = async_test();
-
-          addEventListener("DOMContentLoaded", t.step_func(function() {assert_array_equals(eventOrder, ["inline script #1", "inline script #2"])}), false);
-
-          onload = t.step_func(function() {assert_array_equals(eventOrder, ["inline script #1", "inline script #2", "external script #1"]); t.done();});
-        </script>
-</body>
-</html>