Merge pull request EFForg#2720 from semenko/chrome-test-cleanups

semenko · semenko · commit c55393ebce8d · 2015-08-29T12:24:11.000-05:00
Tiny Chrome test cleanups
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Run the latest code and rulesets in a standalone Firefox profile:
 
 Run the latest code and rulesets in a standalone Chromium profile:
 
-    bash run-chromium.sh
+    bash test-chromium.sh --justrun
 
 Build the Firefox extension as a .xpi package:
 
diff --git a/test/chrome/README.md b/test/chrome/README.md
@@ -2,6 +2,7 @@
 
 - Python 2.7
 - Selenium
-      - Install Selenium as a python package using ```pip install selenium```, or run install-dev-dependencies and it will do the job
+      - Install Selenium as a python package using ```pip install selenium```, or run install-dev-dependencies.sh and it will do the job
 - ChromeDriver
-      - Download ChromeDriver from here, https://sites.google.com/a/chromium.org/chromedriver/downloads. Extract the executable to /usr/bin, so that the pasted executable's full path becomes /usr/bin/chromedriver
+      - Run ```apt-get install chromium-chromedriver```, or run install-dev-dependencies.sh
+      - Or, manually download ChromeDriver from https://sites.google.com/a/chromium.org/chromedriver/downloads. Extract the executable to /usr/lib/chromium-browser/, so that the pasted executable's full path becomes /usr/lib/chromium-browser/chromedriver
diff --git a/test/chrome/script.py b/test/chrome/script.py
@@ -50,9 +50,9 @@ class bcolors:
 
 #Page Loaded
 
-if driver.current_url.startswith('httaps'):
+if driver.current_url.startswith('https'):
 	print bcolors.OKGREEN + "HTTP to HTTPS redirection successful" + bcolors.ENDC
-elif(driver.current_url.startswith('https')):
+elif(driver.current_url.startswith('http')):
 	print bcolors.FAIL + "HTTP to HTTPS redirection failed" + bcolors.ENDC
 	sys.exit(1)
 
