updating firefox binary location and .gitignore

.gitignore

@@ -1,5 +1,5 @@
 # firefox directories
-firefox/
+firefox-bin/
 
 # VIM tmp files
 *~
@@ -66,5 +66,3 @@ coverage.xml
 
 # Sphinx documentation
 docs/_build/
-
->>>>>>> 95fa9a69c555f5556582f79fc142d10c240ee02d

automation/DeployBrowsers/deploy_firefox.py

@@ -128,7 +128,7 @@ def deploy_firefox(status_queue, browser_params, manager_params, crash_recovery)
     # Launch the webdriver
     status_queue.put(('STATUS','Launch Attempted',None))
     #fb = FirefoxBinary(root_dir  + "/../../firefox/firefox", log_file=open(root_dir + '/../../firefox_logging','w'))
-    fb = FirefoxBinary(root_dir  + "/../../firefox/firefox")
+    fb = FirefoxBinary(root_dir  + "/../../firefox-bin/firefox")
     driver = webdriver.Firefox(firefox_profile=fp, firefox_binary=fb)
     status_queue.put(('STATUS','Browser Launched',(int(driver.binary.process.pid), profile_settings)))
 

install.sh

@@ -35,5 +35,6 @@ sudo -H pip install selenium==2.48.0
 
 # Install specific version of Firefox known to work well with the selenium version above
 wget https://ftp.mozilla.org/pub/firefox/releases/41.0.2/linux-x86_64/en-US/firefox-41.0.2.tar.bz2 
-tar jxf firefox*.tar.bz2 -C ./
+tar jxf firefox*.tar.bz2 -C ./firefox-bin
+mv firefox firefox-bin
 rm firefox*.tar.bz2