From 3af8b3103483d8f542475b824fce57e28d58e242 Mon Sep 17 00:00:00 2001 From: Seb35 Date: Sun, 18 Dec 2022 19:56:04 +0100 Subject: [PATCH] Fix two failing tests By the way, converted the timeout parameter to a float. --- check_expire | 3 ++- tests.yaml | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/check_expire b/check_expire index 8e1ab29..329304e 100755 --- a/check_expire +++ b/check_expire @@ -101,7 +101,7 @@ try: elif option == "--hostname" or option == "-H": domain = value elif option == "--timeout" or option == "-t": - timeout = int(value) + timeout = float(value) elif option == "--unixtime" or option == "-u": unixtime = True elif option == "--verbose" or option == "-v": @@ -142,6 +142,7 @@ for server in servers: response = requests.get("%s/domain/%s" % (server, domain), timeout=timeout) except requests.exceptions.Timeout: unknowns += "Timeout when trying to reach %s " % server + continue if response.status_code != 200: errors += "Invalid RDAP return code at %s: %s " % \ (server, response.status_code) diff --git a/tests.yaml b/tests.yaml index 4ea49c1..597b22b 100644 --- a/tests.yaml +++ b/tests.yaml @@ -28,11 +28,11 @@ tests: retcode: 1 partstderr: 'ValueError' - # 2021-07-05: no RDAP server for this TLD + # No RDAP server for this TLD - exe: './check_expire' args: - '-H' - - 'bie.re' + - 'welcome.this-is-not-a-tld' retcode: 3 partstdout: 'No RDAP server' @@ -45,13 +45,13 @@ tests: retcode: 2 partstdout: 'No expiration found' - # Far away and slow, timeout is expected + # With a timeout of 1µs, a timeout is expected - exe: './check_expire' args: - '-t' - - '1' + - '0.000001' - '-H' - - 'nic.ar' + - 'bortzmeyer.org' retcode: 3 partstdout: 'Timeout'