test moar things

modify .travis.yml
debug more
2018-01-04 14:26:28 -08:00 · 2018-01-04 12:08:05 -08:00 · 2018-01-04 12:07:38 -08:00 · 2017-12-08 17:48:21 -08:00 · 2017-12-08 16:37:28 -08:00 · 2017-12-01 16:12:44 -08:00
2 changed files with 12 additions and 54 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,14 @@ cache:
        - $HOME/.cache/pip

 before_install:
+  # In the test-everything branch, we merge master before running tests.
+  # This is because we want test-everything to test the code in master nightly
+  # in a Travis cron, but with a different set of tests than master has
+  # in .travis.yml.
+  - cp .travis.yml /tmp/travis.yml
+  - git pull origin master --strategy=recursive --strategy-option=theirs --no-edit
+  - if ! git diff .travis.yml /tmp/travis.yml ; then echo "Please merge master into test-everything"; exit 1; fi
+  - rm pytest.ini
  - '([ $TRAVIS_OS_NAME == linux ] && dpkg -s libaugeas0) || (brew update && brew install augeas python3)'

 before_script:
@@ -12,50 +20,9 @@ before_script:

 matrix:
  include:
-    - python: "2.7"
-      env: TOXENV=py27_install BOULDER_INTEGRATION=1
-      sudo: required
-      services: docker
-    - python: "2.7"
-      env: TOXENV=cover FYI="this also tests py27"
-    - sudo: required
-      env: TOXENV=nginx_compat
-      services: docker
-      before_install:
-      addons:
-    - python: "2.7"
-      env: TOXENV=lint
-    - python: "2.6"
-      env: TOXENV=py26
-      sudo: required
-      services: docker
-    - python: "2.7"
-      env: TOXENV=py27-oldest
-      sudo: required
-      services: docker
-    - python: "3.3"
-      env: TOXENV=py33
-      sudo: required
-      services: docker
-    - python: "3.6"
-      env: TOXENV=py36
-      sudo: required
-      services: docker
-    - sudo: required
-      env: TOXENV=apache_compat
-      services: docker
-      before_install:
-      addons:
-    - sudo: required
-      env: TOXENV=le_auto_trusty
-      services: docker
-      before_install:
-      addons:
-    - python: "2.7"
-      env: TOXENV=apacheconftest
-      sudo: required
-    - python: "2.7"
-      env: TOXENV=nginxroundtrip
+    - language: generic
+      env: TOXENV=py27
+      os: osx


 # Only build pushes to the master branch, PRs, and branches beginning with
@@ -97,12 +64,3 @@ script:
    - '[ -z "${BOULDER_INTEGRATION+x}" ] || (travis_retry tests/boulder-fetch.sh && tests/tox-boulder-integration.sh)'

 after_success: '[ "$TOXENV" == "cover" ] && coveralls'
-
-notifications:
-  email: false
-  irc:
-    channels:
-      - secure: "SGWZl3ownKx9xKVV2VnGt7DqkTmutJ89oJV9tjKhSs84kLijU6EYdPnllqISpfHMTxXflNZuxtGo0wTDYHXBuZL47w1O32W6nzuXdra5zC+i4sYQwYULUsyfOv9gJX8zWAULiK0Z3r0oho45U+FR5ZN6TPCidi8/eGU+EEPwaAw="
-    on_success: never
-    on_failure: always
-    use_notice: true
--- a/tools/install_and_test.sh
+++ b/tools/install_and_test.sh
@@ -22,5 +22,5 @@ for requirement in "$@" ; do
    # See https://travis-ci.org/certbot/certbot/jobs/308774157#L1333.
    pkg=$(echo "$pkg" | tr - _)
  fi
-  pytest --numprocesses auto --quiet --pyargs $pkg
+  PYTEST_DEBUG=1 pytest --max-slave-restart 0 --numprocesses auto -vvvv --pyargs $pkg
 done
Author	SHA1	Message	Date
Brad Warren	504c5e0453	test moar things	2018-01-04 14:26:28 -08:00
Brad Warren	ee2dc5c449	modify .travis.yml	2018-01-04 12:08:05 -08:00
Brad Warren	f971f55529	debug more	2018-01-04 12:07:38 -08:00
Brad Warren	899b56514a	Merge pull request #5315 from certbot/update-test-everything Update the test everything branch	2017-12-08 17:48:21 -08:00
Brad Warren	fa3bc6d774	Merge branch 'master' into test-everything	2017-12-08 16:37:28 -08:00
Jacob Hoffman-Andrews	76f5f590ea	Add back macOS and Boulder for test-everything. This commit should not be merged to master (if that happens, just revert it). In https://github.com/certbot/certbot/pull/5270, we removed the macOS and most Boulder integration tests from .travis.yml because they made builds very slow. We still want to run those tests nightly, though. The test-everything branch will have the tests that are too expensive to run for every PR.	2017-12-01 16:12:44 -08:00