]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard: Fix e2e chrome and chromium binaries verification 35679/head
authorTiago Melo <tmelo@suse.com>
Fri, 19 Jun 2020 11:19:16 +0000 (11:19 +0000)
committerTiago Melo <tmelo@suse.com>
Fri, 19 Jun 2020 16:28:27 +0000 (16:28 +0000)
Fixes: https://tracker.ceph.com/issues/46110
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit e4b8d7eac352eb31fd17e420521aa2c1ce44453f)

Conflicts:
src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
There was an extra square bracket in octopus that caused the conflict.
This was manually fixed, since the commit that removed it will not be
backported.

src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh

index e144bc4bc588d62ce7b78e82672bd68fc897ad83..6512cb1bf1abcd414ff3e4b485b84aa0b8a62934 100755 (executable)
@@ -40,10 +40,11 @@ check_device_available() {
 
         case "$DEVICE" in
             chrome)
-                [ -x "$(command -v google-chrome)" ] || [ -x "$(command -v google-chrome-stable)" ] ] || failed=true
+                [ -x "$(command -v chrome)" ] || [ -x "$(command -v google-chrome)" ] ||
+                [ -x "$(command -v google-chrome-stable)" ] || failed=true
                 ;;
             chromium)
-                [ -x "$(command -v chromium)" ] || failed=true
+                [ -x "$(command -v chromium)" ] || [ -x "$(command -v chromium-browser)" ] || failed=true
                 ;;
         esac
     fi