Merge branch 'update_Se' into bugfixes

pull/1/head
Raymond Yee 2013-12-30 15:49:05 -05:00
commit cdf93f6ff7
2 changed files with 3 additions and 3 deletions

4
fabfile.py vendored
View File

@ -95,7 +95,7 @@ def email_addresses():
def selenium(): def selenium():
"""setting up selenium to run in the background on RY's laptop""" """setting up selenium to run in the background on RY's laptop"""
with cd('/Users/raymondyee/D/Document/Gluejar/Gluejar.github/regluit'): with cd('/Users/raymondyee/D/Document/Gluejar/Gluejar.github/regluit'):
local("java -jar test/selenium-server-standalone-2.35.0.jar > selenium-rc.log 2>&1 &") local("java -jar test/selenium-server-standalone-2.39.0.jar > selenium-rc.log 2>&1 &")
def test(): def test():
"""run regluit tests locally""" """run regluit tests locally"""
@ -112,4 +112,4 @@ def reboot():
run("sudo shutdown -r now") run("sudo shutdown -r now")
def host_type(): def host_type():
run('uname -s') run('uname -s')

View File

@ -52,7 +52,7 @@ pytz==2012d
rdflib==2.4.0 rdflib==2.4.0
redis==2.6.2 redis==2.6.2
requests==0.14.0 requests==0.14.0
selenium==2.25.0 selenium==2.39.0
six==1.2.0 six==1.2.0
ssh==1.7.14 ssh==1.7.14
stevedore==0.4 stevedore==0.4