From bad463d1dd5e93c1d131cf1a12b59e74609e7f09 Mon Sep 17 00:00:00 2001 From: Stephen Donner Date: Thu, 29 Mar 2018 12:33:39 -0700 Subject: [PATCH 1/2] Add Python 2.7 (py27) to Travis --- .travis.yml | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1c98ce..3372f31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,22 @@ sudo: required +language: python +services: + - docker jobs: include: - stage: - language: python - services: - docker env: - TOXENV=flake8 - before_install: docker build -t axe-selenium-python . - install: skip - script: - - docker run -e TOXENV=$TOXENV axe-selenium-python tox - stage: - language: python - services: - docker + env: TOXENV=py27 + - stage: env: - TOXENV=py36 - before_install: docker build -t axe-selenium-python . - install: skip - script: - - docker run -e TOXENV=$TOXENV axe-selenium-python tox +cache: + pip: true +before_install: docker build -t axe-selenium-python . +install: skip +script: + - docker run -e TOXENV=$TOXENV axe-selenium-python tox +notifications: + email: fte-ci@mozilla.com From 58f8d6ffb4e91584abd0b7c610e407cc90439cbc Mon Sep 17 00:00:00 2001 From: Stephen Donner Date: Thu, 29 Mar 2018 12:47:09 -0700 Subject: [PATCH 2/2] Fix py27 and default/shared [testenv] in Travis --- tox.ini | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tox.ini b/tox.ini index 5f33efd..5748e4d 100644 --- a/tox.ini +++ b/tox.ini @@ -6,16 +6,13 @@ skipsdist = true passenv = HOME DISPLAY MOZ_HEADLESS PYTEST_ADDOPTS PYTEST_BASE_URL \ SAUCELABS_USR SAUCELABS_PSW JENKINS_URL JOB_NAME BUILD_NUMBER deps = -raxe_selenium_python/tests/requirements/tests.txt -commands = pytest \ - --verbose \ - --driver=SauceLabs \ - --base-url=https://web-mozillians-staging.production.paas.mozilla.community +commands = pytest + +[testenv:py27] +commands = pytest [testenv:py36] -commands = pytest \ - --verbose \ - --driver=Firefox \ - --base-url=https://web-mozillians-staging.production.paas.mozilla.community +commands = pytest [testenv:flake8] deps = -raxe_selenium_python/tests/requirements/flake8.txt @@ -23,3 +20,7 @@ commands = flake8 {posargs:.} [flake8] ignore = E501 + +[pytest] +addopts = --verbose --driver=Firefox +base_url = https://web-mozillians-staging.production.paas.mozilla.community