Update web-platform-tests to revision 03fff324c7345277c2a581564bd972f2b5c9f74a

tests/wpt/web-platform-tests/tools/ci/azure/cleanup_win10.yml

@@ -3,10 +3,35 @@
 # necessary because the Windows 10 agents aren't reset between each job.
 steps:
 - powershell: |
+    function UninstallEdge($edgePath, $uninstallArgs) {
+      try {
+        cmd /c taskkill /f /im msedge* `> nul 2`> nul
+        cmd /c taskkill /f /im setup.exe `> nul 2`> nul
+        if (Test-Path $edgePath) {
+          $installerPath = Get-ChildItem -PATH $edgePath -Filter "setup.exe" -Recurse | Select -First 1 FullName
+          if (Test-Path $installerPath.FullName) {
+            Write-Host "Uninstall: $($installerPath.FullName) $uninstallArgs"
+            Start-Process "$($installerPath.FullName)" -ArgumentList $uninstallArgs -Wait
+            Remove-Item -Path $edgePath -Recurse -Force -ErrorAction SilentlyContinue
+          }
+        }
+      } catch [Exception] {
+        Write-Host "Failed to unstall Edge from $edgePath. ERROR= $($_.Exception.Message)" -ForegroundColor Red
+      }
+    }
+
+    # restore hosts file
     $hostFile = "$env:systemroot\System32\drivers\etc\hosts"
     Copy-Item -Path "$hostFile.back" -Destination $hostFile -Force
-    taskkill /f /im MicrosoftEdge*
-    taskkill /f /im MicrosoftWebDriver.exe
+
+    # uninstall Edge
+    UninstallEdge "$env:localappdata\Microsoft\Edge\Application" "--uninstall --force-uninstall"
+    # uninstall Edge Canary channel
+    UninstallEdge "$env:localappdata\Microsoft\Edge SxS\Application" "--uninstall --msedge-sxs --system-level --force-uninstall"
+    # uninstall Edge Dev channel
+    UninstallEdge "$env:systemdrive\Program Files (x86)\Microsoft\Edge Dev\Application" "--uninstall --msedge-dev --system-level --force-uninstall"
+    # uninstall Edge Beta channel
+    UninstallEdge "$env:systemdrive\Program Files (x86)\Microsoft\Edge Beta\Application" "--uninstall --msedge-beta --system-level --force-uninstall"
   displayName: 'Restore hosts file and cleanup test machine'
   condition: always()
   errorActionPreference: silentlyContinue

tests/wpt/web-platform-tests/tools/ci/azure/install_edge.yml

@@ -0,0 +1,32 @@
+parameters:
+  channel: dev
+
+# Should match https://web-platform-tests.org/running-tests/chrome.html
+# Just replace chrome with edgechromium
+steps:
+- ${{ if eq(parameters.channel, 'canary') }}:
+  - powershell: |
+      $edgeInstallerName = 'MicrosoftEdgeSetup.exe'
+      # Link to Canary channel installer
+      Start-BitsTransfer -Source 'https://go.microsoft.com/fwlink/?linkid=2084649&Channel=Canary&language=en-us' -Destination MicrosoftEdgeSetup.exe
+      cmd /c START /WAIT $edgeInstallerName /silent /install
+      $edgePath = "$env:localappdata\Microsoft\Edge SxS\Application"
+      if (Test-Path $edgePath) {
+        Write-Host "##vso[task.prependpath]$edgePath"
+      } else {
+        Throw "Failed to install Edge at $edgePath"
+      }
+    displayName: 'Install Edge Canary'
+- ${{ if eq(parameters.channel, 'dev') }}:
+  - powershell: |
+      $edgeInstallerName = 'MicrosoftEdgeSetup.exe'
+      # Link to Dev channel installer
+      Start-BitsTransfer -Source 'https://go.microsoft.com/fwlink/?linkid=2069324&Channel=Dev&language=en-us' -Destination MicrosoftEdgeSetup.exe
+      cmd /c START /WAIT $edgeInstallerName /silent /install
+      $edgePath = "$env:systemdrive\Program Files (x86)\Microsoft\Edge Dev\Application"
+      if (Test-Path $edgePath) {
+        Write-Host "##vso[task.prependpath]$edgePath"
+      } else {
+        Throw "Failed to install Edge at $edgePath"
+      }
+    displayName: 'Install Edge Dev'

tests/wpt/web-platform-tests/tools/ci/azure/install_safari.yml

@@ -7,7 +7,10 @@ steps:
   - script: |
       # This is equivalent to `Homebrew/homebrew-cask-versions/safari-technology-preview`,
       # but the raw URL is used to bypass caching.
-      HOMEBREW_NO_AUTO_UPDATE=1 brew cask install https://raw.githubusercontent.com/Homebrew/homebrew-cask-versions/master/Casks/safari-technology-preview.rb
+      # Safari Technology Preview version 83 includes a regression that
+      # interferes with results collection. The version of the installation
+      # script referenced here installs STP at version 82.
+      HOMEBREW_NO_AUTO_UPDATE=1 brew cask install https://raw.githubusercontent.com/Homebrew/homebrew-cask-versions/dbde508bb83254c53be4eb6387dbd9fbf9797a35/Casks/safari-technology-preview.rb
       sudo "/Applications/Safari Technology Preview.app/Contents/MacOS/safaridriver" --enable
       defaults write com.apple.SafariTechnologyPreview WebKitJavaScriptCanOpenWindowsAutomatically 1
       defaults write com.apple.SafariTechnologyPreview ExperimentalServerTimingEnabled 1

tests/wpt/web-platform-tests/tools/wpt/browser.py

@@ -697,7 +697,7 @@ class EdgeChromium(Browser):
         return find_executable("msedgedriver")
 
     def install_webdriver(self, dest=None, channel=None, browser_binary=None):
-        if self.platform == "win":
+        if self.platform != "win":
             raise ValueError("Only Windows platform is currently supported")
 
         if dest is None:

tests/wpt/web-platform-tests/tools/wpt/run.py

@@ -354,6 +354,9 @@ class EdgeChromium(BrowserSetup):
                 kwargs["webdriver_binary"] = webdriver_binary
             else:
                 raise WptrunError("Unable to locate or install msedgedriver binary")
+        if kwargs["browser_channel"] == "dev":
+            logger.info("Automatically turning on experimental features for Edge Dev")
+            kwargs["binary_args"].append("--enable-experimental-web-platform-features")
 
 
 class Edge(BrowserSetup):