test ittest-loud-oldest-tests

4 files changed, 5 insertions, 50 deletions

diff --git a/.travis.yml b/.travis.yml
index 111ddb3d4..47713a9fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,53 +13,9 @@ before_script:
 matrix:
   include:
     - python: "2.7"
-      env: TOXENV=py27_install BOULDER_INTEGRATION=v1
-      sudo: required
-      services: docker
-    - python: "2.7"
-      env: TOXENV=py27_install BOULDER_INTEGRATION=v2
-      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: "3.4"
-      env: TOXENV=mypy
-    - python: "3.5"
-      env: TOXENV=mypy
-    - 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
-    - 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
 
 
 # Only build pushes to the master branch, PRs, and branches beginning with
diff --git a/tools/install_and_test.sh b/tools/install_and_test.sh
index 59832cbc3..d144970fb 100755
--- a/tools/install_and_test.sh
+++ b/tools/install_and_test.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -ex
 # pip installs the requested packages in editable mode and runs unit tests on
 # them. Each package is installed and tested in the order they are provided
 # before the script moves on to the next package. If CERTBOT_NO_PIN is set not
@@ -12,7 +12,6 @@ else
   pip_install="$(dirname $0)/pip_install_editable.sh"
 fi
 
-set -x
 for requirement in "$@" ; do
   $pip_install $requirement
   pkg=$(echo $requirement | cut -f1 -d\[)  # remove any extras such as [dev]
diff --git a/tools/pip_install.sh b/tools/pip_install.sh
index 78e2afa17..d8a0c4995 100755
--- a/tools/pip_install.sh
+++ b/tools/pip_install.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -ex
 # pip installs packages using pinned package versions. If CERTBOT_OLDEST is set
 # to 1, a combination of tools/oldest_constraints.txt,
 # tools/dev_constraints.txt, and local-oldest-requirements.txt contained in the
@@ -39,6 +39,6 @@ set -x
 
 # install the requested packages using the pinned requirements as constraints
 if [ -n "$requirements" ]; then
-    pip install -q --constraint "$all_constraints" --requirement "$requirements"
+    pip install --constraint "$all_constraints" --requirement "$requirements"
 fi
-pip install -q --constraint "$all_constraints" "$@"
+pip install --constraint "$all_constraints" "$@"
diff --git a/tools/pip_install_editable.sh b/tools/pip_install_editable.sh
index 6130bf6e7..aa74b307e 100755
--- a/tools/pip_install_editable.sh
+++ b/tools/pip_install_editable.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -ex
 # pip installs packages in editable mode using certbot-auto's requirements file
 # as constraints