Merge branch 'master' into new-test-structure

TheNavigat · TheNavigat · commit 82c8f5bc1c10 · 2015-08-31T22:50:16.000+02:00
diff --git a/install-dev-dependencies.sh b/install-dev-dependencies.sh
@@ -15,7 +15,7 @@ if type apt-get >/dev/null ; then
     chromium-chromedriver
 elif type brew >/dev/null ; then
   brew list python &>/dev/null || brew install python
-  brew install libxml2 gnu-sed
+  brew install libxml2 gnu-sed chromedriver
   if ! echo $PATH | grep -ql /usr/local/bin ; then
     echo '/usr/local/bin not found in $PATH, please add it.'
   fi
diff --git a/test/chromium/script.py b/test/chromium/script.py
@@ -10,14 +10,18 @@
 # of linux is required for the script to run correctly as well.
 # Otherwise, use pyvirtualdisplay.
 
-import time, sys, glob, os, traceback
+import sys
 from selenium import webdriver
-from selenium.webdriver.chrome.options import Options
-from selenium.webdriver.support.wait import WebDriverWait
-from selenium.webdriver.support import expected_conditions
-from selenium.webdriver.common.by import By
 from selenium.common.exceptions import WebDriverException
 
+if sys.platform.startswith("linux"):
+	chromedriver_path = "/usr/lib/chromium-browser/chromedriver"
+elif sys.platform.startswith("darwin"):
+	chromedriver_path = "chromedriver"
+else:
+	print "Unsupported Operating System"
+	sys.exit(3)
+
 class bcolors:
 	HEADER = '\033[95m'
 	OKBLUE = '\033[94m'
@@ -34,25 +38,27 @@ class bcolors:
 # First argument is optional, if not specified will search path.
 
 try:
-	driver = webdriver.Chrome('/usr/lib/chromium-browser/chromedriver', chrome_options = chromeOps)
+	driver = webdriver.Chrome(chromedriver_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"
+		print "ChromeDriver isn't installed. Check test/chrome/README.md\
+		 for instructions on how to install ChromeDriver"
 		sys.exit(0)
 	else:
 		driver.quit()
 		raise e
-		sys.exit(2)
+
+print '' #New line
 
 driver.get('http://libssh.org/robots.txt')
 
 #Page Loaded
 
 if driver.current_url.startswith('https'):
 	print bcolors.OKGREEN + "HTTP to HTTPS redirection successful" + bcolors.ENDC
-elif(driver.current_url.startswith('http')):
+elif driver.current_url.startswith('http'):
 	print bcolors.FAIL + "HTTP to HTTPS redirection failed" + bcolors.ENDC
 	sys.exit(1)
 
