Skip to content

Commit

Permalink
Fix use of testharness.js/testharnessreport.js in *.window.js tests (w…
Browse files Browse the repository at this point in the history
…eb-platform-tests#36069)

These scripts are already included in the template that turns
*.window.js into *.window.html. Including the twice leads to the error
"Identifier 'MessageQueue' has already been declared" in these tests
when run using wptrunner. MessageQueue is a class declared here:
https://github.com/web-platform-tests/wpt/blob/master/tools/wptrunner/wptrunner/testharnessreport.js

There's also one case of testharness-helpers.js being removed. That file
doesn't exist, and the assert_promise_rejects_with_message helper is
defined by /bluetooth/resources/bluetooth-test.js.

Add timeout=long for tests that took close to 10 seconds run and then
passed. These were flagged as slow tests by the Taskcluster stability
checks.
  • Loading branch information
foolip authored Sep 26, 2022
1 parent dc56898 commit 5bcea26
Show file tree
Hide file tree
Showing 104 changed files with 8 additions and 209 deletions.
2 changes: 1 addition & 1 deletion bluetooth/idl/idl-Bluetooth.https.window.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// META: script=/resources/testdriver.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver-vendor.js
'use strict';
const test_desc = 'Bluetooth IDL test';

Expand Down
2 changes: 0 additions & 2 deletions bluetooth/idl/idl-BluetoothDevice.https.window.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
2 changes: 1 addition & 1 deletion bluetooth/idl/idl-BluetoothUUID.window.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// META: script=/resources/testdriver.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver-vendor.js
'use strict'

var base_uuid = '00000000-0000-1000-8000-00805f9b34fb'
Expand Down
2 changes: 1 addition & 1 deletion bluetooth/idl/idl-NavigatorBluetooth.https.window.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// META: script=/resources/testdriver.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver-vendor.js
'use strict';
const test_desc = '[SameObject] test for navigator.bluetooth';

Expand Down
2 changes: 1 addition & 1 deletion bluetooth/idl/idl-NavigatorBluetooth.window.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// META: script=/resources/testdriver.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver-vendor.js
'use strict';

test(() => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharness-helpers.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
2 changes: 0 additions & 2 deletions bluetooth/requestDevice/discovery-succeeds.https.window.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
2 changes: 0 additions & 2 deletions bluetooth/requestDevice/filter-matches.https.window.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
2 changes: 0 additions & 2 deletions bluetooth/requestDevice/le-not-supported.https.window.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
2 changes: 0 additions & 2 deletions bluetooth/requestDevice/radio-not-present.https.window.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
2 changes: 0 additions & 2 deletions bluetooth/requestDevice/request-from-iframe.https.window.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
2 changes: 0 additions & 2 deletions bluetooth/requestDevice/same-device.https.window.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
2 changes: 0 additions & 2 deletions bluetooth/server/connect/connection-succeeds.https.window.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
2 changes: 0 additions & 2 deletions bluetooth/server/connect/get-same-gatt-server.https.window.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
2 changes: 0 additions & 2 deletions bluetooth/server/device-same-object.https.window.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
2 changes: 0 additions & 2 deletions bluetooth/server/disconnect/detach-gc.https.window.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
2 changes: 0 additions & 2 deletions bluetooth/server/disconnect/gc-detach.https.window.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
2 changes: 0 additions & 2 deletions bluetooth/service/device-same-from-2-services.https.window.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
2 changes: 0 additions & 2 deletions bluetooth/service/device-same-object.https.window.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// META: script=/resources/testharness.js
// META: script=/resources/testharnessreport.js
// META: script=/resources/testdriver.js
// META: script=/resources/testdriver-vendor.js
// META: script=/bluetooth/resources/bluetooth-test.js
Expand Down
Loading

0 comments on commit 5bcea26

Please sign in to comment.