From 879d893892deef2d4465ff77bfff4e2cc6ed429e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20J=C3=A4genstedt?= <philip@foolip.org>
Date: Wed, 3 Jan 2018 13:03:22 +0100
Subject: [PATCH 1/2] Call Google Chrome Dev "dev" everywhere except in package
 name

Fixes https://github.com/w3c/web-platform-tests/issues/5956
---
 .travis.yml        | 4 ++--
 tools/ci/ci_wpt.sh | 2 +-
 tools/ci/lib.sh    | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 933183f9a4b773..dfad9bb136ce5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,7 +63,7 @@ matrix:
             - fonts-liberation
       env:
         - secure: "YTSXPwI0DyCA1GhYrLT9KMEV6b7QQKuEeaQgeFDP38OTzJ1+cIj3CC4SRNqbnJ/6SJwPGcdqSxLuV8m4e5HFFnyCcQnJe6h8EMsTehZ7W3j/fP9UYrJqYqvGpe3Vj3xblO5pwBYmq7sg3jAmmuCgAgOW6VGf7cRMucrsmFeo7VM="
-        - JOB=stability SCRIPT=tools/ci/ci_stability.sh PRODUCT=chrome:unstable
+        - JOB=stability SCRIPT=tools/ci/ci_stability.sh PRODUCT=chrome:dev
     - os: linux
       python: "2.7"
       env:
@@ -94,7 +94,7 @@ matrix:
     - env: JOB=build_css SCRIPT=css/build-css-testsuites.sh
     - env:
         - secure: "YTSXPwI0DyCA1GhYrLT9KMEV6b7QQKuEeaQgeFDP38OTzJ1+cIj3CC4SRNqbnJ/6SJwPGcdqSxLuV8m4e5HFFnyCcQnJe6h8EMsTehZ7W3j/fP9UYrJqYqvGpe3Vj3xblO5pwBYmq7sg3jAmmuCgAgOW6VGf7cRMucrsmFeo7VM="
-        - JOB=stability SCRIPT=tools/ci/ci_stability.sh PRODUCT=chrome:unstable
+        - JOB=stability SCRIPT=tools/ci/ci_stability.sh PRODUCT=chrome:dev
     - env:
         - secure: "YTSXPwI0DyCA1GhYrLT9KMEV6b7QQKuEeaQgeFDP38OTzJ1+cIj3CC4SRNqbnJ/6SJwPGcdqSxLuV8m4e5HFFnyCcQnJe6h8EMsTehZ7W3j/fP9UYrJqYqvGpe3Vj3xblO5pwBYmq7sg3jAmmuCgAgOW6VGf7cRMucrsmFeo7VM="
         - JOB=stability SCRIPT=tools/ci/ci_stability.sh PRODUCT=sauce:MicrosoftEdge:14.14393 PLATFORM='Windows 10'
diff --git a/tools/ci/ci_wpt.sh b/tools/ci/ci_wpt.sh
index 2b63413760591c..2e572b2a65be6f 100644
--- a/tools/ci/ci_wpt.sh
+++ b/tools/ci/ci_wpt.sh
@@ -10,7 +10,7 @@ source tools/ci/lib.sh
 main() {
     git fetch --unshallow https://github.com/w3c/web-platform-tests.git +refs/heads/*:refs/remotes/origin/*
     hosts_fixup
-    install_chrome unstable
+    install_chrome dev
     pip install -U tox codecov
     cd tools/wpt
     tox
diff --git a/tools/ci/lib.sh b/tools/ci/lib.sh
index e80499a7d0a9b9..00eae8972bc7a8 100644
--- a/tools/ci/lib.sh
+++ b/tools/ci/lib.sh
@@ -23,6 +23,10 @@ hosts_fixup() {
 
 install_chrome() {
     channel=$1
+    # The package name for Google Chrome Dev uses "unstable", not "dev".
+    if [[ $channel == "dev" ]]; then
+        $channel="unstable"
+    fi
     deb_archive=google-chrome-${channel}_current_amd64.deb
     wget https://dl.google.com/linux/direct/$deb_archive
 

From d6e920dacb32049c748523d70433a6e6fb5c17dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20J=C3=A4genstedt?= <philip@foolip.org>
Date: Wed, 3 Jan 2018 13:14:17 +0100
Subject: [PATCH 2/2] oopsie

---
 tools/ci/lib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci/lib.sh b/tools/ci/lib.sh
index 00eae8972bc7a8..db49ec6b449286 100644
--- a/tools/ci/lib.sh
+++ b/tools/ci/lib.sh
@@ -25,7 +25,7 @@ install_chrome() {
     channel=$1
     # The package name for Google Chrome Dev uses "unstable", not "dev".
     if [[ $channel == "dev" ]]; then
-        $channel="unstable"
+        channel="unstable"
     fi
     deb_archive=google-chrome-${channel}_current_amd64.deb
     wget https://dl.google.com/linux/direct/$deb_archive