Skip to content

Commit

Permalink
Revert
Browse files Browse the repository at this point in the history
  • Loading branch information
undera committed Feb 7, 2017
1 parent e017064 commit fdc6788
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ install:
- nvm install 4.2
- nvm use 4.2
- gem install rspec
- pip install colorlog pyyaml psutil!=5.1.1 lxml cssselect urwid six selenium progressbar33 locustio pyvirtualdisplay
- pip install colorlog pyyaml psutil!=4.4.0 lxml cssselect urwid six selenium==2.53.1 progressbar33 locustio pyvirtualdisplay
script: coverage run `which nosetests`
after_success:
- codecov
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ environment:
install:
- choco install firefox -version 46.0.1
- "%PYTHON%\\python.exe -m pip install nose"
- "%PYTHON%\\python.exe -m pip install colorlog pyyaml psutil!=5.1.1 lxml==3.4.2 cssselect urwid six progressbar33 locustio pyvirtualdisplay"
- "%PYTHON%\\python.exe -m pip install --upgrade selenium"
- "%PYTHON%\\python.exe -m pip install colorlog pyyaml psutil!=4.4.0 lxml==3.4.2 cssselect urwid six progressbar33 locustio pyvirtualdisplay"
- "%PYTHON%\\python.exe -m pip install --upgrade selenium==2.53.0"
- set PATH=C:\Ruby22\bin;%PATH%

build: off
Expand Down
5 changes: 3 additions & 2 deletions bzt/modules/selenium.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,9 @@ class SeleniumExecutor(AbstractSeleniumExecutor, WidgetProvider, FileLister):
:type virtual_display: Display
:type runner: AbstractTestRunner
"""
SELENIUM_DOWNLOAD_LINK = "http://selenium-release.storage.googleapis.com/3.0/" \
"selenium-server-standalone-3.0.1.jar"
SELENIUM_DOWNLOAD_LINK = "http://selenium-release.storage.googleapis.com/{version}/" \
"selenium-server-standalone-{version}.0.jar"
SELENIUM_VERSION = "2.53"

JUNIT_DOWNLOAD_LINK = "http://search.maven.org/remotecontent?filepath=junit/junit/" \
"{version}/junit-{version}.jar"
Expand Down
3 changes: 2 additions & 1 deletion virtualenv-test.bash
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ virtualenv --clear build
source build/bin/activate

# install depends
pip install --upgrade colorlog pyyaml psutil!=5.1.1 lxml cssselect nose urwid selenium six pylint progressbar33 locustio pyvirtualdisplay pynsist
pip install --upgrade colorlog pyyaml psutil!=4.4.0 lxml cssselect nose urwid six pylint selenium==2.53.1 progressbar33 locustio pyvirtualdisplay pynsist

pylint -d R0903,R0904,C0301,C0302,C0111,E1103,R0201,R0902,W0511,F0401,E0611,R0801,R0913,W0613,C0412,I0011,C0411 --extension-pkg-whitelist=lxml -f parseable bzt > build/pylint.out || echo

Expand All @@ -26,6 +26,7 @@ source build/bin/activate
cd build # cd is to make it not find bzt package from sources
pip install --upgrade ../dist/bzt-*.tar.gz
pip install locustio
pip install --upgrade selenium==2.53.1
pip show selenium
cd ..

Expand Down

0 comments on commit fdc6788

Please sign in to comment.