From 904b4d8db3806b96d107cf737a4827ddbdeb7efd Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Tue, 14 May 2019 00:04:05 +0200 Subject: [PATCH] Try without wait in OCSP --- .travis.yml | 187 ------------------ .../certbot_tests/test_main.py | 3 - 2 files changed, 190 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1482dfe63..8fa45548e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,90 +30,6 @@ extended-test-suite: &extended-test-suite matrix: include: - # Main test suite - - python: "2.7" - env: ACME_SERVER=pebble TOXENV=integration - 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: ACME_SERVER=boulder-v1 TOXENV=integration - sudo: required - services: docker - <<: *extended-test-suite - - python: "2.7" - env: ACME_SERVER=boulder-v2 TOXENV=integration - sudo: required - services: docker - <<: *extended-test-suite - - python: "2.7" - env: TOXENV=py27-certbot-oldest - <<: *extended-test-suite - - python: "2.7" - env: TOXENV=py27-nginx-oldest - <<: *extended-test-suite - python: "2.7" env: ACME_SERVER=boulder-v1 TOXENV=integration-certbot-oldest sudo: required @@ -124,109 +40,6 @@ matrix: sudo: required services: docker <<: *extended-test-suite - - python: "2.7" - env: ACME_SERVER=boulder-v1 TOXENV=integration-nginx-oldest - sudo: required - services: docker - <<: *extended-test-suite - - python: "2.7" - env: ACME_SERVER=boulder-v2 TOXENV=integration-nginx-oldest - sudo: required - services: docker - <<: *extended-test-suite - - python: "3.4" - env: TOXENV=py34 - <<: *extended-test-suite - - python: "3.5" - env: TOXENV=py35 - <<: *extended-test-suite - - python: "3.6" - env: TOXENV=py36 - <<: *extended-test-suite - - python: "3.7" - dist: xenial - env: TOXENV=py37 - <<: *extended-test-suite - - python: "3.4" - env: ACME_SERVER=boulder-v1 TOXENV=integration - sudo: required - services: docker - <<: *extended-test-suite - - python: "3.4" - env: ACME_SERVER=boulder-v2 TOXENV=integration - sudo: required - services: docker - <<: *extended-test-suite - - python: "3.5" - env: ACME_SERVER=boulder-v1 TOXENV=integration - sudo: required - services: docker - <<: *extended-test-suite - - python: "3.5" - env: ACME_SERVER=boulder-v2 TOXENV=integration - sudo: required - services: docker - <<: *extended-test-suite - - python: "3.6" - env: ACME_SERVER=boulder-v1 TOXENV=integration - sudo: required - services: docker - <<: *extended-test-suite - - python: "3.6" - env: ACME_SERVER=boulder-v2 TOXENV=integration - sudo: required - services: docker - <<: *extended-test-suite - - python: "3.7" - dist: xenial - env: ACME_SERVER=boulder-v1 TOXENV=integration - sudo: required - services: docker - <<: *extended-test-suite - - python: "3.7" - dist: xenial - env: ACME_SERVER=boulder-v2 TOXENV=integration - 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 diff --git a/certbot-ci/certbot_integration_tests/certbot_tests/test_main.py b/certbot-ci/certbot_integration_tests/certbot_tests/test_main.py index 5ce19dcb8..1348b0ca1 100644 --- a/certbot-ci/certbot_integration_tests/certbot_tests/test_main.py +++ b/certbot-ci/certbot_integration_tests/certbot_tests/test_main.py @@ -568,9 +568,6 @@ def test_ocsp_status_live(context): # OSCP 2: Check live certificate OCSP status (REVOKED) context.certbot(['revoke', '--cert-name', cert, '--no-delete-after-revoke']) - # Sometimes in oldest tests (using openssl binary and not cryptography), the OCSP status is - # not seen immediately by Certbot as invalid. Waiting few seconds solves this transient issue. - time.sleep(5) output = context.certbot(['certificates']) assert output.count('INVALID') == 1, 'Expected {0} to be INVALID'.format(cert)