fix CI WPT test

Force WPT using the dev chrome channel
GoogleChromeLabs · May 6, 2022 · 457380f · 457380f
1 parent 7de4105
commit 457380f
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 48 deletions.
diff --git a/.github/workflows/wpt.yml b/.github/workflows/wpt.yml
@@ -11,54 +11,58 @@ jobs:
   wpt:
     runs-on: ubuntu-20.04
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        submodules: true
-    - name: Set up Node.js
-      uses: actions/setup-node@v1
-      with:
-        node-version: 16.x
-    - name: Install dependencies
-      run: npm install
-    - name: Build
-      run: npm run build
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.9'
-    - name: Set up virtualenv
-      run: pip install virtualenv
-    - name: Set up hosts
-      run: ./wpt make-hosts-file | sudo tee -a /etc/hosts
-      working-directory: wpt
-    # TODO: Install a pinned version of Chromium. This may become possible
-    # after https://github.com/web-platform-tests/wpt/issues/28970.
-    - name: Install Chromium
-      run: ./wpt install chromium browser
-      working-directory: wpt
-    - name: Run tests
-      # For verbose logging, add --log-mach - --log-mach-level info
-      run: ./wpt run --webdriver-binary ../runBiDiServer.sh --binary _venv3/browsers/nightly/chrome-linux/chrome --manifest MANIFEST.json --metadata ../wpt-metadata --log-wptreport wptreport.json chromium webdriver/tests/bidi/
-      working-directory: wpt
-    - name: Update expectations
-      if: ${{ always() }}
-      run: ./wpt update-expectations --product chromium --manifest MANIFEST.json --metadata ../wpt-metadata wptreport.json
-      working-directory: wpt
-    - name: Upload expectations
-      if: ${{ always() }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: wpt-metadata
-        path: wpt-metadata
-    - name: Upload logs
-      if: ${{ always() }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: logs
-        # Note: runBiDiServer.sh will be run multiple times and log.txt will be
-        # overwritten. The problem might not be in the log.txt written last.
-        path: logs
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Set up Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16.x
+      - name: Install dependencies
+        run: npm install
+      - name: Build
+        run: npm run build
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.9'
+      - name: Set up virtualenv
+        run: pip install virtualenv
+      - name: Set up hosts
+        run: ./wpt make-hosts-file | sudo tee -a /etc/hosts
+        working-directory: wpt
+      # TODO: Install a pinned version of Chromium. This may become possible
+      # after https://github.com/web-platform-tests/wpt/issues/28970.
+      - name: Install Chromium
+        # This installs dev chrome to `/usr/bin/google-chrome-unstable`.
+        run: |
+          wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+          sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+          sudo apt-get update
+          sudo apt-get install -y google-chrome-unstable
+      - name: Run tests
+        # For verbose logging, add --log-mach - --log-mach-level info
+        run: ./wpt run --webdriver-binary ../runBiDiServer.sh --binary /usr/bin/google-chrome-unstable --manifest MANIFEST.json --metadata ../wpt-metadata --log-wptreport wptreport.json chromium webdriver/tests/bidi/
+        working-directory: wpt
+      - name: Update expectations
+        if: ${{ always() }}
+        run: ./wpt update-expectations --product chromium --manifest MANIFEST.json --metadata ../wpt-metadata wptreport.json
+        working-directory: wpt
+      - name: Upload expectations
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: wpt-metadata
+          path: wpt-metadata
+      - name: Upload logs
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: logs
+          # Note: runBiDiServer.sh will be run multiple times and log.txt will be
+          # overwritten. The problem might not be in the log.txt written last.
+          path: logs
 
 env:
   FORCE_COLOR: 3
diff --git a/runBiDiServer.sh b/runBiDiServer.sh
@@ -8,4 +8,5 @@ mkdir -p logs
 
 NODE_OPTIONS="--unhandled-rejections=strict" \
 DEBUG=* \
+CHANNEL=chrome-dev \
 npm run server-no-build -- "$@" 2>&1 | tee -a logs/$$.log