Skip to content

Commit 5bddd95

Browse files
committed
update .eu tests to use test_com_expiration, remove unnecessary test_eu_parse
1 parent 16c5fa3 commit 5bddd95

3 files changed

Lines changed: 81 additions & 114 deletions

File tree

test/samples/expected/eurid.eu

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,29 @@
1-
{"domain_name": "eurid.eu", "expiration_date": null, "updated_date": null, "registrar": "EURid vzw", "registrar_url": "https://www.eurid.eu", "creation_date": null, "status": null}
1+
{
2+
"domain_name": "eurid.eu",
3+
"script": "LATIN",
4+
"reseller_org": null,
5+
"reseller_lang": null,
6+
"reseller_email": null,
7+
"tech_org": "EURid vzw",
8+
"tech_lang": "en",
9+
"tech_email": "tech@eurid.eu",
10+
"registrar": "EURid vzw",
11+
"registrar_url": "https://www.eurid.eu",
12+
"name_servers": [
13+
"ns3.eurid.eu (185.36.4.253)",
14+
"ns3.eurid.eu (2001:67c:9c:3937::253)",
15+
"nsx.eurid.eu (185.151.141.1)",
16+
"nsx.eurid.eu (2a02:568:fe00::6575)",
17+
"ns1.eurid.eu (2001:67c:9c:3937::252)",
18+
"ns1.eurid.eu (185.36.4.252)",
19+
"ns2.eurid.eu (2001:67c:40:3937::252)",
20+
"ns2.eurid.eu (185.36.6.252)",
21+
"ns4.eurid.eu (2001:67c:40:3937::253)",
22+
"ns4.eurid.eu (185.36.6.253)",
23+
"nsp.netnod.se"
24+
],
25+
"dnssec_flags": "KSK",
26+
"dnssec_protocol": "3",
27+
"dnssec_algorithm": "RSA_SHA256",
28+
"dnssec_pubkey": "AwEAAcOQldGtC33GLx8s335UscKMPlWjDXCqbhR2QyAYcfS4CZS6YHg3A1Zz/K3VurTZF68aSaRkNupZuEgt4jozE3v4+t+2qOfiATvoOCrf74hWduBPwk9Go0z7FVlDkok1/qMQmqOtih8TFP85b+w6F/uyLMZS1JowMDUzRurmHJVoT4lW9+OCdrhuQFK9vU24Y8BmacoRy6mWBCFlysizlOIodwmquOf5A+3Nz0B3TLCK4fIYJYVxCUVlpRJ7uaBS+GLD7afuxkEesReYHgPWZFSDMbXk9Ugh+qUi8tEKKFls9TM3lK9BPBcciXUhI1bRJSHftqcNpMmLqg/79SwoWGc="
29+
}

test/samples/whois/eurid.eu

Lines changed: 52 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,52 @@
1+
% The WHOIS service offered by EURid and the access to the records
2+
% in the EURid WHOIS database are provided for information purposes
3+
% only. It allows persons to check whether a specific domain name
4+
% is still available or not and to obtain information related to
5+
% the registration records of existing domain names.
6+
%
7+
% EURid cannot, under any circumstances, be held liable in case the
8+
% stored information would prove to be wrong, incomplete or not
9+
% accurate in any sense.
10+
%
11+
% By submitting a query, you agree not to use the information made
12+
% available to:
13+
%
14+
% - allow, enable or otherwise support the transmission of unsolicited,
15+
% commercial advertising or other solicitations whether via email or
16+
% otherwise;
17+
% - target advertising in any possible way;
18+
% - cause nuisance in any possible way by sending messages to registrants,
19+
% whether by automated, electronic processes capable of enabling
20+
% high volumes or by other possible means.
21+
%
22+
% Without prejudice to the above, it is explicitly forbidden to extract,
23+
% copy and/or use or re-utilise in any form and by any means
24+
% (electronically or not) the whole or a quantitatively or qualitatively
25+
% substantial part of the contents of the WHOIS database without prior
26+
% and explicit permission by EURid, nor in any attempt hereof, to apply
27+
% automated, electronic processes to EURid (or its systems).
28+
%
29+
% You agree that any reproduction and/or transmission of data for
30+
% commercial purposes will always be considered as the extraction of a
31+
% substantial part of the content of the WHOIS database.
32+
%
33+
% By submitting the query, you agree to abide by this policy and accept
34+
% that EURid can take measures to limit the use of its WHOIS services
35+
% to protect the privacy of its registrants or the integrity
36+
% of the database.
37+
%
38+
% The EURid WHOIS service on port 43 (textual WHOIS) never discloses
39+
% any information concerning the registrant.
40+
% Registrant and on-site contact information can be obtained through use of the
41+
% web-based WHOIS service available from the EURid website www.eurid.eu
42+
%
143
% WHOIS eurid.eu
244
Domain: eurid.eu
345
Script: LATIN
446

547
Registrant:
648
NOT DISCLOSED!
7-
Visit www.eurid.eu for webbased WHOIS.
49+
Visit www.eurid.eu for the web-based WHOIS.
850

951
Technical:
1052
Organisation: EURid vzw
@@ -16,8 +58,16 @@ Registrar:
1658
Website: https://www.eurid.eu
1759

1860
Name servers:
19-
ns1.eurid.eu (185.36.4.252)
61+
ns3.eurid.eu (185.36.4.253)
62+
ns3.eurid.eu (2001:67c:9c:3937::253)
63+
nsx.eurid.eu (185.151.141.1)
64+
nsx.eurid.eu (2a02:568:fe00::6575)
2065
ns1.eurid.eu (2001:67c:9c:3937::252)
66+
ns1.eurid.eu (185.36.4.252)
67+
ns2.eurid.eu (2001:67c:40:3937::252)
68+
ns2.eurid.eu (185.36.6.252)
69+
ns4.eurid.eu (2001:67c:40:3937::253)
70+
ns4.eurid.eu (185.36.6.253)
2171
nsp.netnod.se
2272

2373
Keys:

test/test_parser.py

Lines changed: 0 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -858,117 +858,6 @@ def test_cm_parse(self):
858858
'ns1.huaweicloud-dns.org']
859859
}
860860
self._parse_and_compare("icp.cm", data, expected_results)
861-
862-
def test_eu_parse(self):
863-
data = """
864-
% The WHOIS service offered by EURid and the access to the records
865-
% in the EURid WHOIS database are provided for information purposes
866-
% only. It allows persons to check whether a specific domain name
867-
% is still available or not and to obtain information related to
868-
% the registration records of existing domain names.
869-
%
870-
% EURid cannot, under any circumstances, be held liable in case the
871-
% stored information would prove to be wrong, incomplete or not
872-
% accurate in any sense.
873-
%
874-
% By submitting a query, you agree not to use the information made
875-
% available to:
876-
%
877-
% - allow, enable or otherwise support the transmission of unsolicited,
878-
% commercial advertising or other solicitations whether via email or
879-
% otherwise;
880-
% - target advertising in any possible way;
881-
% - cause nuisance in any possible way by sending messages to registrants,
882-
% whether by automated, electronic processes capable of enabling
883-
% high volumes or by other possible means.
884-
%
885-
% Without prejudice to the above, it is explicitly forbidden to extract,
886-
% copy and/or use or re-utilise in any form and by any means
887-
% (electronically or not) the whole or a quantitatively or qualitatively
888-
% substantial part of the contents of the WHOIS database without prior
889-
% and explicit permission by EURid, nor in any attempt hereof, to apply
890-
% automated, electronic processes to EURid (or its systems).
891-
%
892-
% You agree that any reproduction and/or transmission of data for
893-
% commercial purposes will always be considered as the extraction of a
894-
% substantial part of the content of the WHOIS database.
895-
%
896-
% By submitting the query, you agree to abide by this policy and accept
897-
% that EURid can take measures to limit the use of its WHOIS services
898-
% to protect the privacy of its registrants or the integrity
899-
% of the database.
900-
%
901-
% The EURid WHOIS service on port 43 (textual WHOIS) never discloses
902-
% any information concerning the registrant.
903-
% Registrant and on-site contact information can be obtained through use of the
904-
% web-based WHOIS service available from the EURid website www.eurid.eu
905-
%
906-
% WHOIS eurid.eu
907-
Domain: eurid.eu
908-
Script: LATIN
909-
910-
Registrant:
911-
NOT DISCLOSED!
912-
Visit www.eurid.eu for the web-based WHOIS.
913-
914-
Technical:
915-
Organisation: EURid vzw
916-
Language: en
917-
Email: tech@eurid.eu
918-
919-
Registrar:
920-
Name: EURid vzw
921-
Website: https://www.eurid.eu
922-
923-
Name servers:
924-
ns3.eurid.eu (185.36.4.253)
925-
ns3.eurid.eu (2001:67c:9c:3937::253)
926-
nsx.eurid.eu (185.151.141.1)
927-
nsx.eurid.eu (2a02:568:fe00::6575)
928-
ns1.eurid.eu (2001:67c:9c:3937::252)
929-
ns1.eurid.eu (185.36.4.252)
930-
ns2.eurid.eu (2001:67c:40:3937::252)
931-
ns2.eurid.eu (185.36.6.252)
932-
ns4.eurid.eu (2001:67c:40:3937::253)
933-
ns4.eurid.eu (185.36.6.253)
934-
nsp.netnod.se
935-
936-
Keys:
937-
flags:KSK protocol:3 algorithm:RSA_SHA256 pubKey:AwEAAcOQldGtC33GLx8s335UscKMPlWjDXCqbhR2QyAYcfS4CZS6YHg3A1Zz/K3VurTZF68aSaRkNupZuEgt4jozE3v4+t+2qOfiATvoOCrf74hWduBPwk9Go0z7FVlDkok1/qMQmqOtih8TFP85b+w6F/uyLMZS1JowMDUzRurmHJVoT4lW9+OCdrhuQFK9vU24Y8BmacoRy6mWBCFlysizlOIodwmquOf5A+3Nz0B3TLCK4fIYJYVxCUVlpRJ7uaBS+GLD7afuxkEesReYHgPWZFSDMbXk9Ugh+qUi8tEKKFls9TM3lK9BPBcciXUhI1bRJSHftqcNpMmLqg/79SwoWGc=
938-
939-
Please visit www.eurid.eu for more info.
940-
"""
941-
942-
expected_results = {
943-
"domain_name": "eurid.eu",
944-
"script": "LATIN",
945-
"reseller_org": None,
946-
"reseller_lang": None,
947-
"reseller_email": None,
948-
"tech_org": "EURid vzw",
949-
"tech_lang": "en",
950-
"tech_email": "tech@eurid.eu",
951-
"registrar": "EURid vzw",
952-
"registrar_url": "https://www.eurid.eu",
953-
"name_servers": [
954-
"ns3.eurid.eu (185.36.4.253)",
955-
"ns3.eurid.eu (2001:67c:9c:3937::253)",
956-
"nsx.eurid.eu (185.151.141.1)",
957-
"nsx.eurid.eu (2a02:568:fe00::6575)",
958-
"ns1.eurid.eu (2001:67c:9c:3937::252)",
959-
"ns1.eurid.eu (185.36.4.252)",
960-
"ns2.eurid.eu (2001:67c:40:3937::252)",
961-
"ns2.eurid.eu (185.36.6.252)",
962-
"ns4.eurid.eu (2001:67c:40:3937::253)",
963-
"ns4.eurid.eu (185.36.6.253)",
964-
"nsp.netnod.se",
965-
],
966-
"dnssec_flags": "KSK",
967-
"dnssec_protocol": "3",
968-
"dnssec_algorithm": "RSA_SHA256",
969-
"dnssec_pubkey": "AwEAAcOQldGtC33GLx8s335UscKMPlWjDXCqbhR2QyAYcfS4CZS6YHg3A1Zz/K3VurTZF68aSaRkNupZuEgt4jozE3v4+t+2qOfiATvoOCrf74hWduBPwk9Go0z7FVlDkok1/qMQmqOtih8TFP85b+w6F/uyLMZS1JowMDUzRurmHJVoT4lW9+OCdrhuQFK9vU24Y8BmacoRy6mWBCFlysizlOIodwmquOf5A+3Nz0B3TLCK4fIYJYVxCUVlpRJ7uaBS+GLD7afuxkEesReYHgPWZFSDMbXk9Ugh+qUi8tEKKFls9TM3lK9BPBcciXUhI1bRJSHftqcNpMmLqg/79SwoWGc=",
970-
}
971-
self._parse_and_compare("eurid.eu", data, expected_results)
972861

973862

974863
if __name__ == "__main__":

0 commit comments

Comments
 (0)