Bug 1467666 [wpt PR 11394] - Update webusb test Upstream re-attempt at https://github.com/web-platform-tests/wpt/pull/9854. Adds more untested IDL deps., a=testonly
authorLuke Bjerring <lukebjerring@chromium.org>
Fri, 06 Jul 2018 16:38:35 +0000
changeset 425851 e31898f7a7f7228f0d86ede17022db043182c6d8
parent 425850 0dc96ac9cc8c9ecf4f0fdadfcf31103ea1cbf744
child 425852 72aa25bf1e23eb7f598d7b7e4ffc0bc59f072b18
push id34267
push userrgurzau@mozilla.com
push dateWed, 11 Jul 2018 22:05:21 +0000
treeherdermozilla-central@3aca103e4915 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1467666, 11394, 1089862, 567118
milestone63.0a1
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
Bug 1467666 [wpt PR 11394] - Update webusb test Upstream re-attempt at https://github.com/web-platform-tests/wpt/pull/9854. Adds more untested IDL deps., a=testonly Automatic update from web-platform-testsUpdate webusb test Upstream re-attempt at https://github.com/web-platform-tests/wpt/pull/9854. Adds more untested IDL deps. Change-Id: Icf7bda0f264ec66f4980e0742485eb406e334c19 Reviewed-on: https://chromium-review.googlesource.com/1089862 Commit-Queue: Luke Bj <lukebjerring@chromium.org> Reviewed-by: Reilly Grant <reillyg@chromium.org> Cr-Commit-Position: refs/heads/master@{#567118} -- wpt-commits: 1110f36ff667fbfa004ae52aad161ccba2574dbe wpt-pr: 11394
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/webusb/idlharness.https.html
testing/web-platform/tests/webusb/resources/idlharness.dedicatedworker.sharedworker.js
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -623529,25 +623529,25 @@
    "1d5ec928a52fda02907002a7869af7b9a4bfcc71",
    "support"
   ],
   "webusb/README.md": [
    "34eaa588ed78672070782cb556939ea711a18caf",
    "support"
   ],
   "webusb/idlharness.https.html": [
-   "5a97c893eb0e23e3cba14501de9955cfbb0b385a",
+   "f225060cbc1af55acd1f795a2ffeb1d3f4c91a02",
    "testharness"
   ],
   "webusb/resources/fake-devices.js": [
    "2cfce7b35b9441529946c4bcea9427e261808c36",
    "support"
   ],
   "webusb/resources/idlharness.dedicatedworker.sharedworker.js": [
-   "2a847fbeded0fe0b895cb5675f90b685f749f40a",
+   "02bbfadd68f2c2aefbc18dc2440bbfcb534c6b17",
    "support"
   ],
   "webusb/resources/open-in-iframe.html": [
    "6e6050f742e0da58fc94a5c0a0aa75f16dfcede9",
    "support"
   ],
   "webusb/resources/usb-helpers.js": [
    "7a5878c9f4c472bafa8f3db026573feba8e746b0",
--- a/testing/web-platform/tests/webusb/idlharness.https.html
+++ b/testing/web-platform/tests/webusb/idlharness.https.html
@@ -19,28 +19,28 @@
       var usbDevice;
       var usbConfiguration;
       var usbInterface;
       var usbAlternateInterface;
       var usbEndpoint;
       var usbConnectionEvent;
 
       usb_test(async () => {
-        let response = await fetch('/interfaces/webusb.idl');
-        let idl_text = await response.text();
-        let idl_array = new IdlArray();
-        idl_array.add_idls(idl_text);
+        const idl = await fetch('/interfaces/webusb.idl').then(r => r.text());
+        const html = await fetch('/interfaces/html.idl').then(r => r.text());
+        const dom = await fetch('/interfaces/dom.idl').then(r => r.text());
+
+        const idl_array = new IdlArray();
+        idl_array.add_idls(idl);
+        idl_array.add_dependency_idls(html);
+        idl_array.add_dependency_idls(dom);
 
         // Untested IDL interfaces
-        idl_array.add_untested_idls('interface Event {};');
-        idl_array.add_untested_idls('interface EventHandler {};');
-        idl_array.add_untested_idls('dictionary EventInit {};');
-        idl_array.add_untested_idls('interface EventTarget {};');
-        idl_array.add_untested_idls('interface Navigator {};');
-        idl_array.add_untested_idls('interface WorkerNavigator {};');
+        idl_array.add_untested_idls('dictionary PermissionDescriptor {};');
+        idl_array.add_untested_idls('interface PermissionStatus {};');
 
         let {device} = await getFakeDevice();
 
         usbDevice = device;
         usbConfiguration = usbDevice.configurations[0];
         usbInterface = usbConfiguration.interfaces[0];
         usbAlternateInterface = usbInterface.alternates[0];
         usbEndpoint = usbAlternateInterface.endpoints[0];
--- a/testing/web-platform/tests/webusb/resources/idlharness.dedicatedworker.sharedworker.js
+++ b/testing/web-platform/tests/webusb/resources/idlharness.dedicatedworker.sharedworker.js
@@ -9,29 +9,28 @@ importScripts('/webusb/resources/usb-hel
 var usbDevice;
 var usbConfiguration;
 var usbInterface;
 var usbAlternateInterface;
 var usbEndpoint;
 var usbConnectionEvent;
 
 usb_test(async () => {
-  let webUSBResponse = await fetch('/interfaces/webusb.idl');
-  let domResponse = await fetch('/interfaces/dom.idl');
-  let webusb_idl_text = await webUSBResponse.text();
-  let dom_idl_text = await domResponse.text();
+  const idl = await fetch('/interfaces/webusb.idl').then(r => r.text());
+  const html = await fetch('/interfaces/html.idl').then(r => r.text());
+  const dom = await fetch('/interfaces/dom.idl').then(r => r.text());
+
   let idl_array = new IdlArray();
-  idl_array.add_idls(webusb_idl_text);
+  idl_array.add_idls(idl);
+  idl_array.add_dependency_idls(html);
+  idl_array.add_dependency_idls(dom);
 
   // Untested IDL interfaces
-  idl_array.add_untested_idls(dom_idl_text, { only: ['Event', 'EventTarget'] });
-  idl_array.add_untested_idls('interface EventHandler {};');
-  idl_array.add_untested_idls('dictionary EventInit {};');
-  idl_array.add_untested_idls('interface Navigator {};');
-  idl_array.add_untested_idls('interface WorkerNavigator {};');
+  idl_array.add_untested_idls('dictionary PermissionDescriptor {};');
+  idl_array.add_untested_idls('interface PermissionStatus {};');
 
   let {device} = await getFakeDevice();
 
   usbDevice = device;
   usbConfiguration = usbDevice.configurations[0];
   usbInterface = usbConfiguration.interfaces[0];
   usbAlternateInterface = usbInterface.alternates[0];
   usbEndpoint = usbAlternateInterface.endpoints[0];
@@ -53,9 +52,9 @@ usb_test(async () => {
     USBIsochronousOutTransferResult: ['new USBIsochronousOutTransferResult([])'],
     USBIsochronousInTransferPacket: ['new USBIsochronousInTransferPacket("ok")'],
     USBIsochronousOutTransferPacket: ['new USBIsochronousOutTransferPacket("ok")'],
   });
 
   idl_array.test();
 }, 'WebUSB on Workers IDL test');
 
-done();
\ No newline at end of file
+done();