Merge pull request EFForg#2811 from TheNavigat/fix-2801

semenko · semenko · commit 634784601496 · 2015-09-06T16:54:34.000-05:00
Fixing failing installation of ChromeDriver on Debian
diff --git a/install-dev-dependencies.sh b/install-dev-dependencies.sh
@@ -4,15 +4,17 @@
 set -o errexit -o xtrace
 if type apt-get >/dev/null ; then
   BROWSERS="firefox chromium-browser"
+  CHROMEDRIVER="chromium-chromedriver"
   if [[ "$(lsb_release -is)" == "Debian" ]]; then
     # Iceweasel is the rebranded Firefox that Debian ships, and Chromium
     # takes the name of 'chromium' instead of 'chromium-browser' in
     # Debian 7 (wheezy) and later.
     BROWSERS="iceweasel chromium"
+    CHROMEDRIVER="chromedriver"
   fi
   sudo apt-get install libxml2-dev libxml2-utils libxslt1-dev python-dev \
     $BROWSERS zip sqlite3 python-pip libcurl4-openssl-dev \
-    chromium-chromedriver
+    $CHROMEDRIVER
 elif type brew >/dev/null ; then
   brew list python &>/dev/null || brew install python
   brew install libxml2 gnu-sed chromedriver
diff --git a/test/chromium/script.py b/test/chromium/script.py
@@ -10,7 +10,7 @@
 # of linux is required for the script to run correctly as well.
 # Otherwise, use pyvirtualdisplay.
 
-import sys, os
+import sys, os, platform
 from selenium import webdriver
 from selenium.common.exceptions import WebDriverException
 
@@ -35,7 +35,12 @@ class bcolors:
     # Travis has setuid restrictions. I think this becomes unnecessary in M42+?
     chromeOps.add_argument('--disable-setuid-sandbox')
 elif sys.platform.startswith("linux"):
-    chromedriver_path = "/usr/lib/chromium-browser/chromedriver"
+    if 'Ubuntu' in platform.linux_distribution():
+        chromedriver_path = "/usr/lib/chromium-browser/chromedriver"
+    elif 'debian' in platform.linux_distribution():
+        #Debian is lowercase when platform.linux_distribution() is used.
+        #This is not a mistake.
+        chromedriver_path = "/usr/lib/chromium/chromedriver"
 else:
     # Let's hope it's in the user's path.
     chromedriver_path = "chromedriver"
