Fix two failing tests
By the way, converted the timeout parameter to a float.
This commit is contained in:
parent
b3709c64e9
commit
3af8b31034
@ -101,7 +101,7 @@ try:
|
|||||||
elif option == "--hostname" or option == "-H":
|
elif option == "--hostname" or option == "-H":
|
||||||
domain = value
|
domain = value
|
||||||
elif option == "--timeout" or option == "-t":
|
elif option == "--timeout" or option == "-t":
|
||||||
timeout = int(value)
|
timeout = float(value)
|
||||||
elif option == "--unixtime" or option == "-u":
|
elif option == "--unixtime" or option == "-u":
|
||||||
unixtime = True
|
unixtime = True
|
||||||
elif option == "--verbose" or option == "-v":
|
elif option == "--verbose" or option == "-v":
|
||||||
@ -142,6 +142,7 @@ for server in servers:
|
|||||||
response = requests.get("%s/domain/%s" % (server, domain), timeout=timeout)
|
response = requests.get("%s/domain/%s" % (server, domain), timeout=timeout)
|
||||||
except requests.exceptions.Timeout:
|
except requests.exceptions.Timeout:
|
||||||
unknowns += "Timeout when trying to reach %s " % server
|
unknowns += "Timeout when trying to reach %s " % server
|
||||||
|
continue
|
||||||
if response.status_code != 200:
|
if response.status_code != 200:
|
||||||
errors += "Invalid RDAP return code at %s: %s " % \
|
errors += "Invalid RDAP return code at %s: %s " % \
|
||||||
(server, response.status_code)
|
(server, response.status_code)
|
||||||
|
10
tests.yaml
10
tests.yaml
@ -28,11 +28,11 @@ tests:
|
|||||||
retcode: 1
|
retcode: 1
|
||||||
partstderr: 'ValueError'
|
partstderr: 'ValueError'
|
||||||
|
|
||||||
# 2021-07-05: no RDAP server for this TLD
|
# No RDAP server for this TLD
|
||||||
- exe: './check_expire'
|
- exe: './check_expire'
|
||||||
args:
|
args:
|
||||||
- '-H'
|
- '-H'
|
||||||
- 'bie.re'
|
- 'welcome.this-is-not-a-tld'
|
||||||
retcode: 3
|
retcode: 3
|
||||||
partstdout: 'No RDAP server'
|
partstdout: 'No RDAP server'
|
||||||
|
|
||||||
@ -45,13 +45,13 @@ tests:
|
|||||||
retcode: 2
|
retcode: 2
|
||||||
partstdout: 'No expiration found'
|
partstdout: 'No expiration found'
|
||||||
|
|
||||||
# Far away and slow, timeout is expected
|
# With a timeout of 1µs, a timeout is expected
|
||||||
- exe: './check_expire'
|
- exe: './check_expire'
|
||||||
args:
|
args:
|
||||||
- '-t'
|
- '-t'
|
||||||
- '1'
|
- '0.000001'
|
||||||
- '-H'
|
- '-H'
|
||||||
- 'nic.ar'
|
- 'bortzmeyer.org'
|
||||||
retcode: 3
|
retcode: 3
|
||||||
partstdout: 'Timeout'
|
partstdout: 'Timeout'
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user