diff --git a/e2e_test/.travis.yml b/e2e_test/.travis.yml index 838aefb82..3dac7fba1 100644 --- a/e2e_test/.travis.yml +++ b/e2e_test/.travis.yml @@ -1,15 +1,12 @@ language: python -services: - - docker - -dist: xenial +dist: focal python: - - "3.5" - "3.6" - "3.7" - "3.8" + - "3.9" install: - pip install -r requirements-test.txt diff --git a/e2e_test/Dockerfile b/e2e_test/Dockerfile index a6219e1e2..acfc9d2e0 100644 --- a/e2e_test/Dockerfile +++ b/e2e_test/Dockerfile @@ -9,7 +9,6 @@ RUN zypper -n install -y --no-recommends \ MozillaFirefox-branding-upstream \ chromium \ file \ - python3 \ python3-paramiko \ python3-PyVirtualDisplay \ python3-selenium \ @@ -25,7 +24,7 @@ RUN zypper -n install -y --no-recommends \ tar \ wget && \ zypper -n clean -a && \ - wget -O- https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-linux64.tar.gz | tar zxf - -C /usr/local/bin/ + wget -O- https://github.com/mozilla/geckodriver/releases/download/v0.27.0/geckodriver-v0.27.0-linux64.tar.gz | tar zxf - -C /usr/local/bin/ RUN chmod +x /usr/local/bin/* diff --git a/e2e_test/Makefile b/e2e_test/Makefile index a211244c1..3262f99ff 100644 --- a/e2e_test/Makefile +++ b/e2e_test/Makefile @@ -1,7 +1,3 @@ test: @flake8 --ignore=E501 @pylint --ignored-modules=distutils *.py - -test-docker: - @docker build -t hawk_test -f Dockerfile.alpine . - @docker run --rm hawk_test --help diff --git a/e2e_test/README.md b/e2e_test/README.md index 71d1872d5..1df4a048f 100644 --- a/e2e_test/README.md +++ b/e2e_test/README.md @@ -34,7 +34,7 @@ Notes: - [Geckodriver](https://github.com/mozilla/geckodriver/releases) - Chromium (optional) - [Chromedriver](https://chromedriver.chromium.org/downloads) (optional) - - Python 3 + - Python 3.6+ - Python packages: - paramiko - selenium diff --git a/e2e_test/requirements.txt b/e2e_test/requirements.txt index aa5747fb3..3dac0e66c 100644 --- a/e2e_test/requirements.txt +++ b/e2e_test/requirements.txt @@ -1,11 +1,11 @@ -bcrypt==3.1.7 -cffi==1.13.1 -cryptography==2.8 -EasyProcess==0.2.7 -paramiko==2.6.0 -pycparser==2.19 -PyNaCl==1.3.0 -PyVirtualDisplay==0.2.4 +bcrypt==3.2.0 +cffi==1.14.3 +cryptography==3.2 +EasyProcess==0.3 +paramiko==2.7.2 +pycparser==2.20 +PyNaCl==1.4.0 +PyVirtualDisplay==1.3.2 selenium==3.141.0 -six==1.12.0 -urllib3==1.25.6 +six==1.15.0 +urllib3==1.25.11