diff options
author | Schuyler Duveen <sky@skyb.us> | 2017-06-06 20:11:33 +0300 |
---|---|---|
committer | Brad Warren <bmw@users.noreply.github.com> | 2017-06-06 20:11:33 +0300 |
commit | 7531c9891633bf777abc0230241d45399f0cbd7a (patch) | |
tree | cbafa5386a036ec57e6f46d8f8004a2babcc9fe5 /acme | |
parent | f0e1be55d693d50794699775c768a3156645babb (diff) |
fixes #3616: make sure there is always one time that we test the sockā¦ (#4712)
Diffstat (limited to 'acme')
-rw-r--r-- | acme/acme/standalone_test.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/acme/acme/standalone_test.py b/acme/acme/standalone_test.py index 613258c97..c3beab34b 100644 --- a/acme/acme/standalone_test.py +++ b/acme/acme/standalone_test.py @@ -137,7 +137,6 @@ class TestSimpleTLSSNI01Server(unittest.TestCase): ) self.old_cwd = os.getcwd() os.chdir(self.test_cwd) - self.thread.start() def tearDown(self): os.chdir(self.old_cwd) @@ -146,13 +145,12 @@ class TestSimpleTLSSNI01Server(unittest.TestCase): def test_it(self): max_attempts = 5 - while max_attempts: - max_attempts -= 1 + for attempt in range(max_attempts): try: cert = crypto_util.probe_sni( b'localhost', b'0.0.0.0', self.port) except errors.Error: - self.assertTrue(max_attempts > 0, "Timeout!") + self.assertTrue(attempt + 1 < max_attempts, "Timeout!") time.sleep(1) # wait until thread starts else: self.assertEqual(jose.ComparableX509(cert), @@ -160,6 +158,11 @@ class TestSimpleTLSSNI01Server(unittest.TestCase): 'rsa2048_cert.pem')) break + if attempt == 0: + # the first attempt is always meant to fail, so we can test + # the socket failure code-path for probe_sni, as well + self.thread.start() + if __name__ == "__main__": unittest.main() # pragma: no cover |