letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Relaxes CT integration test hack further. (#2670) 

In 18f4c5c we introduced a workaround for the CT submission integration
test to allow exactly expected, or twice as many CT log submissions as
expected to account for the case where the ocsp-updater and the CA race.
This didn't completely patch over the issue because the number of
submissions can fall between `n` and `2n`.

This commit updates the hack to be even hackier (twice as hacky or your
money back). Now we consider any value *between* `n` and `2n` as a test
pass.
This commit is contained in:
Daniel McCarney 2017-04-07 16:02:40 -04:00 committed by GitHub
parent 29bc4033ed
commit 4bc28ff0c4
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/integration-test.py
View File

@ -175,13 +175,13 @@ def test_ct_submission():
auth_and_issue([random_domain()])
submissions_a = urllib2.urlopen(url_a).read()
# Presently the CA and the ocsp-updater can race on the initial submission
# of a certificate to the configured logs. This results in double submitting
# of a certificate to the configured logs. This results in over submitting
# certificates. This is expected to be fixed in the future by a planned
# redesign so for now we do not error when the submissions are exactly
# double expected. See Boulder #2610 for more information:
# https://github.com/letsencrypt/boulder/issues/2610
if (int(submissions_a) != expected_a_submissions and
int(submissions_a) != 2 * expected_a_submissions):
# redesign so for now we do not error when the number of submissions falls
# between the expected value and two times the expected. See Boulder #2610
# for more information: https://github.com/letsencrypt/boulder/issues/2610
if (int(submissions_a) < expected_a_submissions or
int(submissions_a) > 2 * expected_a_submissions):
raise Exception("Expected %d CT submissions to boulder:4500, found %s" % (expected_a_submissions, submissions_a))
# Only test when ResubmitMissingSCTsOnly is enabled
if not default_config_dir.startswith("test/config-next"):
@ -189,11 +189,11 @@ def test_ct_submission():
for _ in range(0, 10):
submissions_a = urllib2.urlopen(url_a).read()
submissions_b = urllib2.urlopen(url_b).read()
if (int(submissions_a) != expected_a_submissions and
int(submissions_a) != 2 * expected_a_submissions):
if (int(submissions_a) < expected_a_submissions or
int(submissions_a) > 2 * expected_a_submissions):
raise Exception("Expected no change in submissions to boulder:4500: expected %s, got %s" % (expected_a_submissions, submissions_a))
if (int(submissions_b) == expected_b_submissions or
int(submissions_b) == 2 * expected_b_submissions):
if (int(submissions_b) >= expected_b_submissions and
int(submissions_b) < 2 * expected_b_submissions + 1):
return
time.sleep(1)
raise Exception("Expected %d CT submissions to boulder:4501, found %s" % (expected_b_submissions, submissions_b))