Merge branch 'revert-fix-macos-pytest' into test-revert-fix-macos-pytest

This reverts commit 5388842e5b.

.travis.yml

@@ -5,7 +5,11 @@ cache:
         - $HOME/.cache/pip
 
 before_install:
-  - '([ $TRAVIS_OS_NAME == linux ] && dpkg -s libaugeas0) || (brew update && brew install augeas python3 && brew upgrade python && brew link python)'
+  # 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.
+  - '([ $TRAVIS_OS_NAME == linux ] && dpkg -s libaugeas0) || (brew update && brew install augeas && brew upgrade python python3 && brew link python)'
 
 before_script:
   - 'if [ $TRAVIS_OS_NAME = osx ] ; then ulimit -n 1024 ; fi'
@@ -13,7 +17,15 @@ before_script:
 matrix:
   include:
     - python: "2.7"
-      env: TOXENV=py27_install BOULDER_INTEGRATION=v1
+      env: TOXENV=cover FYI="this also tests py27"
+    - python: "2.7"
+      env: TOXENV=lint
+    - python: "2.7"
+      env: TOXENV=py27-nginx-oldest BOULDER_INTEGRATION=v1
+      sudo: required
+      services: docker
+    - python: "2.7"
+      env: TOXENV=py27-nginx-oldest BOULDER_INTEGRATION=v2
       sudo: required
       services: docker
     - python: "2.7"
@@ -21,41 +33,71 @@ matrix:
       sudo: required
       services: docker
     - python: "2.7"
-      env: TOXENV=cover FYI="this also tests py27"
-    - sudo: required
-      env: TOXENV=nginx_compat
+      env: TOXENV=py27_install BOULDER_INTEGRATION=v1
+      sudo: required
       services: docker
-      before_install:
-      addons:
     - python: "2.7"
-      env: TOXENV=lint
-    - python: "2.7"
-      env: TOXENV='py27-{acme,apache,certbot,dns,nginx}-oldest'
-      sudo: required
-      services: docker
-    - python: "3.4"
-      env: TOXENV=py34
-      sudo: required
-      services: docker
-    - python: "3.6"
-      env: TOXENV=py36
-      sudo: required
-      services: docker
+      env: TOXENV='py27-{acme,apache,certbot,dns}-oldest'
     - sudo: required
       env: TOXENV=apache_compat
       services: docker
-      before_install:
-      addons:
+    - sudo: required
+      env: TOXENV=nginx_compat
+      services: docker
+    - sudo: required
+      env: TOXENV=le_auto_precise
+      services: docker
     - sudo: required
       env: TOXENV=le_auto_trusty
       services: docker
-      before_install:
+    - sudo: required
+      env: TOXENV=le_auto_wheezy
+      services: docker
+    - sudo: required
+      env: TOXENV=le_auto_centos6
+      services: docker
+    - sudo: required
+      env: TOXENV=docker_dev
+      services: docker
       addons:
+        apt:
+          packages:  # don't install nginx and apache
+          - libaugeas0
     - python: "2.7"
       env: TOXENV=apacheconftest
       sudo: required
+    - python: "3.4"
+      env: TOXENV=py34 BOULDER_INTEGRATION=v1
+      sudo: required
+      services: docker
+    - python: "3.4"
+      env: TOXENV=py34 BOULDER_INTEGRATION=v2
+      sudo: required
+      services: docker
+    - python: "3.5"
+      env: TOXENV=py35 BOULDER_INTEGRATION=v1
+      sudo: required
+      services: docker
+    - python: "3.5"
+      env: TOXENV=py35 BOULDER_INTEGRATION=v2
+      sudo: required
+      services: docker
+    - python: "3.6"
+      env: TOXENV=py36 BOULDER_INTEGRATION=v1
+      sudo: required
+      services: docker
+    - python: "3.6"
+      env: TOXENV=py36 BOULDER_INTEGRATION=v2
+      sudo: required
+      services: docker
     - python: "2.7"
       env: TOXENV=nginxroundtrip
+    - language: generic
+      env: TOXENV=py27
+      os: osx
+    - language: generic
+      env: TOXENV=py36
+      os: osx
 
 
 # Only build pushes to the master branch, PRs, and branches beginning with
@@ -100,9 +142,3 @@ 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

pytest.ini

@@ -1,2 +0,0 @@
-[pytest]
-addopts = --quiet

tools/install_and_test.sh

@@ -19,5 +19,5 @@ for requirement in "$@" ; do
   if [ $pkg = "." ]; then
     pkg="certbot"
   fi
-  "$(dirname $0)/pytest.sh" --pyargs $pkg
+  pytest --numprocesses auto --quiet --pyargs $pkg
 done

tools/pytest.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-# Runs pytest with the provided arguments, adding --numprocesses to the command
-# line. This argument is set to "auto" if the environmnent variable TRAVIS is
-# not set, otherwise, it is set to 2. This works around
-# https://github.com/pytest-dev/pytest-xdist/issues/9. Currently every Travis
-# environnment provides two cores. See
-# https://docs.travis-ci.com/user/reference/overview/#Virtualization-environments.
-
-if ${TRAVIS:-false}; then
-    NUMPROCESSES="2"
-else
-    NUMPROCESSES="auto"
-fi
-
-pytest --numprocesses "$NUMPROCESSES" "$@"

tox.cover.sh

@@ -51,8 +51,7 @@ cover () {
   fi
 
   pkg_dir=$(echo "$1" | tr _ -)
-  pytest="$(dirname $0)/tools/pytest.sh"
-  "$pytest" --cov "$pkg_dir" --cov-append --cov-report= --pyargs "$1"
+  pytest --cov "$pkg_dir" --cov-append --cov-report= --numprocesses auto --pyargs "$1"
   coverage report --fail-under="$min" --include="$pkg_dir/*" --show-missing
 }
 

tox.ini

@@ -60,8 +60,6 @@ commands =
 setenv =
     PYTHONPATH = {toxinidir}
     PYTHONHASHSEED = 0
-passenv =
-    TRAVIS
 
 [testenv:py27-oldest]
 commands =
@@ -69,40 +67,30 @@ commands =
 setenv =
     {[testenv]setenv}
     CERTBOT_OLDEST=1
-passenv =
-    {[testenv]passenv}
 
 [testenv:py27-acme-oldest]
 commands =
     {[base]install_and_test} acme[dev]
 setenv =
     {[testenv:py27-oldest]setenv}
-passenv =
-    {[testenv:py27-oldest]passenv}
 
 [testenv:py27-apache-oldest]
 commands =
     {[base]install_and_test} certbot-apache
 setenv =
     {[testenv:py27-oldest]setenv}
-passenv =
-    {[testenv:py27-oldest]passenv}
 
 [testenv:py27-certbot-oldest]
 commands =
     {[base]install_and_test} .[dev]
 setenv =
     {[testenv:py27-oldest]setenv}
-passenv =
-    {[testenv:py27-oldest]passenv}
 
 [testenv:py27-dns-oldest]
 commands =
     {[base]install_and_test} {[base]dns_packages}
 setenv =
     {[testenv:py27-oldest]setenv}
-passenv =
-    {[testenv:py27-oldest]passenv}
 
 [testenv:py27-nginx-oldest]
 commands =
@@ -110,8 +98,6 @@ commands =
     python tests/lock_test.py
 setenv =
     {[testenv:py27-oldest]setenv}
-passenv =
-    {[testenv:py27-oldest]passenv}
 
 [testenv:py27_install]
 basepython = python2.7
@@ -123,8 +109,6 @@ basepython = python2.7
 commands =
     {[base]install_packages}
     ./tox.cover.sh
-passenv =
-    {[testenv]passenv}
 
 [testenv:lint]
 basepython = python2.7