Integrating Chrome testing with Travis

TheNavigat · TheNavigat · commit 1991398c6322 · 2015-09-03T22:45:42.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -11,16 +11,22 @@ addons:
       - python-dev
       - libcurl4-openssl-dev
       - python-lxml
+      - python-software-properties
+      - chromium-browser
   firefox: "37.0"
 virtualenv:
   system_site_packages: true
 install:
   - pip install -r https-everywhere-checker/requirements.txt
   - pip install -r test/chromium/requirements.txt
-before_script:
-  - sh -e /etc/init.d/xvfb start
 env:
   - DISPLAY=':99.0'
+before_script:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - wget https://chromedriver.storage.googleapis.com/2.12/chromedriver_linux64.zip
+  - unzip chromedriver_linux64.zip
+  - mv chromedriver test/chromium/chromedriver
 script:
   - ./test.sh
 sudo: false
@@ -34,4 +40,3 @@ notifications:
         - "irc.oftc.net#https-everywhere"
       on_success: change
       on_failure: change
-
diff --git a/test.sh b/test.sh
@@ -10,4 +10,4 @@ cd $(dirname $0)/$(dirname $(readlink $0))
 
 ./test/rules.sh
 ./test/firefox.sh $@
-# ./test/chromium.sh $@
+./test/chromium.sh $@
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
+import sys, os
 from selenium import webdriver
 from selenium.common.exceptions import WebDriverException
 
@@ -26,20 +26,27 @@ class bcolors:
 
 chromeOps = webdriver.ChromeOptions()
 chromeOps.add_extension(sys.argv[1])
+chromeOps.add_argument("--disable-setuid-sandbox")
+
+chromdriver_path = "chromedriver"
+
+if 'TRAVIS' in os.environ:
+	chromeOps.add_argument('--no-sandbox')
+	chromdriver_path = os.path.abspath("test/chromium/chromedriver")
 
 # First argument is optional, if not specified will search path.
 
 try:
-	driver = webdriver.Chrome('chromedriver', chrome_options=chromeOps)
+	driver = webdriver.Chrome(chromdriver_path, chrome_options=chromeOps)
 except WebDriverException as e:
 	error = e.__str__()
 
 	if "executable needs to be in PATH" in e.__str__():
 		print "ChromeDriver isn't installed. Check test/chrome/README.md\
-		 for instructions on how to install ChromeDriver"
+for instructions on how to install ChromeDriver"
+
 		sys.exit(2)
 	else:
-		driver.quit()
 		raise e
 
 print '' #New line
