From 6fe554dfe21d9482b7dc9cebfbd4e4c4312c10df Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Tue, 14 May 2019 19:21:23 -0700 Subject: [PATCH] test it --- .travis.yml | 178 ------------------------------------------ certbot/tests/util.py | 6 +- 2 files changed, 1 insertion(+), 183 deletions(-) diff --git a/.travis.yml b/.travis.yml index b23164a19..9bfd758ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,180 +28,9 @@ extended-test-suite: &extended-test-suite matrix: include: - # Main test suite - - python: "2.7" - env: BOULDER_INTEGRATION=v1 INTEGRATION_TEST=all TOXENV=py27_install - sudo: required - services: docker - <<: *not-on-master - - python: "2.7" - env: BOULDER_INTEGRATION=v2 INTEGRATION_TEST=all TOXENV=py27_install - sudo: required - services: docker - <<: *not-on-master - - # This job is always executed, including on master - python: "2.7" env: TOXENV=py27-cover FYI="py27 tests + code coverage" - - sudo: required - env: TOXENV=nginx_compat - services: docker - before_install: - addons: - <<: *not-on-master - - python: "2.7" - env: TOXENV=lint - <<: *not-on-master - - python: "3.4" - env: TOXENV=mypy - <<: *not-on-master - - python: "3.5" - env: TOXENV=mypy - <<: *not-on-master - - python: "2.7" - env: TOXENV='py27-{acme,apache,certbot,dns,nginx,postfix}-oldest' - sudo: required - services: docker - <<: *not-on-master - - python: "3.4" - env: TOXENV=py34 - sudo: required - services: docker - <<: *not-on-master - - python: "3.7" - dist: xenial - env: TOXENV=py37 - sudo: required - services: docker - <<: *not-on-master - - sudo: required - env: TOXENV=apache_compat - services: docker - before_install: - addons: - <<: *not-on-master - - sudo: required - env: TOXENV=le_auto_trusty - services: docker - before_install: - addons: - <<: *not-on-master - - python: "2.7" - env: TOXENV=apacheconftest-with-pebble - sudo: required - services: docker - <<: *not-on-master - - python: "2.7" - env: TOXENV=nginxroundtrip - <<: *not-on-master - - # Extended test suite on cron jobs and pushes to tested branches other than master - - python: "3.7" - dist: xenial - env: TOXENV=py37 CERTBOT_NO_PIN=1 - <<: *extended-test-suite - - python: "2.7" - env: BOULDER_INTEGRATION=v1 INTEGRATION_TEST=certbot TOXENV=py27-certbot-oldest - sudo: required - services: docker - <<: *extended-test-suite - - python: "2.7" - env: BOULDER_INTEGRATION=v2 INTEGRATION_TEST=certbot TOXENV=py27-certbot-oldest - sudo: required - services: docker - <<: *extended-test-suite - - python: "2.7" - env: BOULDER_INTEGRATION=v1 INTEGRATION_TEST=nginx TOXENV=py27-nginx-oldest - sudo: required - services: docker - <<: *extended-test-suite - - python: "2.7" - env: BOULDER_INTEGRATION=v2 INTEGRATION_TEST=nginx TOXENV=py27-nginx-oldest - sudo: required - services: docker - <<: *extended-test-suite - - python: "3.4" - env: TOXENV=py34 BOULDER_INTEGRATION=v1 - sudo: required - services: docker - <<: *extended-test-suite - - python: "3.4" - env: TOXENV=py34 BOULDER_INTEGRATION=v2 - sudo: required - services: docker - <<: *extended-test-suite - - python: "3.5" - env: TOXENV=py35 BOULDER_INTEGRATION=v1 - sudo: required - services: docker - <<: *extended-test-suite - - python: "3.5" - env: TOXENV=py35 BOULDER_INTEGRATION=v2 - sudo: required - services: docker - <<: *extended-test-suite - - python: "3.6" - env: TOXENV=py36 BOULDER_INTEGRATION=v1 - sudo: required - services: docker - <<: *extended-test-suite - - python: "3.6" - env: TOXENV=py36 BOULDER_INTEGRATION=v2 - sudo: required - services: docker - <<: *extended-test-suite - - python: "3.7" - dist: xenial - env: TOXENV=py37 BOULDER_INTEGRATION=v1 - sudo: required - services: docker - <<: *extended-test-suite - - python: "3.7" - dist: xenial - env: TOXENV=py37 BOULDER_INTEGRATION=v2 - sudo: required - services: docker - <<: *extended-test-suite - - sudo: required - env: TOXENV=le_auto_xenial - services: docker - <<: *extended-test-suite - - sudo: required - env: TOXENV=le_auto_jessie - services: docker - <<: *extended-test-suite - - sudo: required - env: TOXENV=le_auto_centos6 - services: docker - <<: *extended-test-suite - - sudo: required - env: TOXENV=docker_dev - services: docker - addons: - apt: - packages: # don't install nginx and apache - - libaugeas0 - <<: *extended-test-suite - - language: generic - env: TOXENV=py27 - os: osx - addons: - homebrew: - packages: - - augeas - - python2 - <<: *extended-test-suite - - language: generic - env: TOXENV=py3 - os: osx - addons: - homebrew: - packages: - - augeas - - python3 - <<: *extended-test-suite - # container-based infrastructure sudo: false @@ -228,10 +57,3 @@ after_success: '[ "$TOXENV" == "py27-cover" ] && codecov -F linux' notifications: email: false - irc: - channels: - - secure: "SGWZl3ownKx9xKVV2VnGt7DqkTmutJ89oJV9tjKhSs84kLijU6EYdPnllqISpfHMTxXflNZuxtGo0wTDYHXBuZL47w1O32W6nzuXdra5zC+i4sYQwYULUsyfOv9gJX8zWAULiK0Z3r0oho45U+FR5ZN6TPCidi8/eGU+EEPwaAw=" - on_cancel: never - on_success: never - on_failure: always - use_notice: true diff --git a/certbot/tests/util.py b/certbot/tests/util.py index a261ea6b2..c2118ec74 100644 --- a/certbot/tests/util.py +++ b/certbot/tests/util.py @@ -342,11 +342,7 @@ class TempDirTestCase(unittest.TestCase): def handle_rw_files(_, path, __): """Handle read-only files, that will fail to be removed on Windows.""" filesystem.chmod(path, stat.S_IWRITE) - try: - os.remove(path) - except (IOError, OSError): - # TODO: remote the try/except once all logic from windows file permissions is merged - pass + os.remove(path) shutil.rmtree(self.tempdir, onerror=handle_rw_files)