diff options
author | matsduf <mats.dufberg@iis.se> | 2017-12-19 16:11:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-19 16:11:11 +0100 |
commit | f08fe5c2c5419764616b7b3a9f7c41c98191c8d0 (patch) | |
tree | 0fa22de665f7ed6850f0db219f347e24f6501870 /t | |
parent | 3f7ab3e83792ebe7ec4a8a023207dee44a539448 (diff) |
Fixed issue #26 (#27)
* Fixed so rr.t so it matches current Internet and changed so that tests that depend on network are not run by default (issue #26)
* .travis.yml is updated so that network tests are always run.
* Updated README.md to document the new solution.
Diffstat (limited to 't')
-rw-r--r-- | t/axfr.t | 2 | ||||
-rw-r--r-- | t/dnssec.t | 2 | ||||
-rw-r--r-- | t/netldns.t | 2 | ||||
-rw-r--r-- | t/regression.t | 2 | ||||
-rw-r--r-- | t/resolver.t | 6 | ||||
-rw-r--r-- | t/rr.t | 27 | ||||
-rw-r--r-- | t/rrlist.t | 2 | ||||
-rw-r--r-- | t/threads.t | 2 | ||||
-rw-r--r-- | t/utils.t | 2 |
9 files changed, 25 insertions, 22 deletions
@@ -4,7 +4,7 @@ use Test::Fatal; BEGIN { use_ok( 'Zonemaster::LDNS' ) } SKIP: { - skip 'no network', 3 if $ENV{TEST_NO_NETWORK}; + skip 'no network', 3 unless $ENV{TEST_WITH_NETWORK}; my $res = Zonemaster::LDNS->new( '46.21.106.227' ); my $res2 = Zonemaster::LDNS->new( '192.36.144.107' ); @@ -64,7 +64,7 @@ isa_ok($nsec3, 'Zonemaster::LDNS::RR::NSEC3'); ok($nsec3->covers('xx-example.com'), 'Covers xx-example.com'); SKIP: { - skip 'no network', 3 if $ENV{TEST_NO_NETWORK}; + skip 'no network', 3 unless $ENV{TEST_WITH_NETWORK}; $res = Zonemaster::LDNS->new( '212.247.7.228' ); $res->dnssec( 1 ); diff --git a/t/netldns.t b/t/netldns.t index 53c9239..12e29f7 100644 --- a/t/netldns.t +++ b/t/netldns.t @@ -8,7 +8,7 @@ my $lib_v = version->parse(Zonemaster::LDNS::lib_version()); ok( $lib_v >= v1.6.16, 'ldns version at least 1.6.16' ); SKIP: { - skip 'no network', 59 if $ENV{TEST_NO_NETWORK}; + skip 'no network', 59 unless $ENV{TEST_WITH_NETWORK}; my $s = Zonemaster::LDNS->new( '8.8.8.8' ); isa_ok( $s, 'Zonemaster::LDNS' ); diff --git a/t/regression.t b/t/regression.t index 5838478..c037fb5 100644 --- a/t/regression.t +++ b/t/regression.t @@ -7,7 +7,7 @@ use warnings; BEGIN { use_ok("Zonemaster::LDNS")} SKIP: { - skip 'no network', 2 if $ENV{TEST_NO_NETWORK}; + skip 'no network', 2 unless $ENV{TEST_WITH_NETWORK}; my $s = Zonemaster::LDNS->new( '8.8.8.8' ); isa_ok( $s, 'Zonemaster::LDNS' ); diff --git a/t/resolver.t b/t/resolver.t index fc6147b..838d733 100644 --- a/t/resolver.t +++ b/t/resolver.t @@ -3,7 +3,7 @@ use Test::More; use Zonemaster::LDNS; SKIP: { - skip 'no network', 20 if $ENV{TEST_NO_NETWORK}; + skip 'no network', 20 unless $ENV{TEST_WITH_NETWORK}; my $r = Zonemaster::LDNS->new( '8.8.8.8' ); @@ -59,7 +59,7 @@ SKIP: { subtest 'recursion' => sub { SKIP: { - skip 'no network', 3 if $ENV{TEST_NO_NETWORK}; + skip 'no network', 3 unless $ENV{TEST_WITH_NETWORK}; my $r = Zonemaster::LDNS->new( '8.8.4.4' ); my $p1 = $r->query( 'www.iis.se' ); @@ -73,7 +73,7 @@ subtest 'recursion' => sub { subtest 'global' => sub { SKIP: { - skip 'no network', 3 if $ENV{TEST_NO_NETWORK}; + skip 'no network', 3 unless $ENV{TEST_WITH_NETWORK}; my $res = new_ok( 'Zonemaster::LDNS' ); my $p = eval { $res->query( 'www.iis.se' ) } ; @@ -6,11 +6,11 @@ use MIME::Base64; BEGIN { use_ok( 'Zonemaster::LDNS' ) } my $s; -$s = Zonemaster::LDNS->new( '8.8.8.8' ) unless $ENV{TEST_NO_NETWORK}; +$s = Zonemaster::LDNS->new( '8.8.8.8' ) if $ENV{TEST_WITH_NETWORK}; subtest 'rdf' => sub { SKIP: { - skip 'no network', 1 if $ENV{TEST_NO_NETWORK}; + skip 'no network', 1 unless $ENV{TEST_WITH_NETWORK}; my $p = $s->query( 'iis.se', 'SOA' ); plan skip_all => 'No response, cannot test' if not $p; @@ -27,7 +27,7 @@ subtest 'rdf' => sub { subtest 'SOA' => sub { SKIP: { - skip 'no network', 1 if $ENV{TEST_NO_NETWORK}; + skip 'no network', 1 unless $ENV{TEST_WITH_NETWORK}; my $p = $s->query( 'iis.se', 'SOA' ); plan skip_all => 'No response, cannot test' if not $p; @@ -47,7 +47,7 @@ subtest 'SOA' => sub { subtest 'A' => sub { SKIP: { - skip 'no network', 1 if $ENV{TEST_NO_NETWORK}; + skip 'no network', 1 unless $ENV{TEST_WITH_NETWORK}; my $p = $s->query( 'a.ns.se' ); plan skip_all => 'No response, cannot test' if not $p; @@ -63,7 +63,7 @@ subtest 'A' => sub { subtest 'AAAA' => sub { SKIP: { - skip 'no network', 1 if $ENV{TEST_NO_NETWORK}; + skip 'no network', 1 unless $ENV{TEST_WITH_NETWORK}; $p = $s->query( 'a.ns.se', 'AAAA' ); plan skip_all => 'No response, cannot test' if not $p; @@ -78,7 +78,7 @@ subtest 'AAAA' => sub { subtest 'TXT' => sub { SKIP: { - skip 'no network', 1 if $ENV{TEST_NO_NETWORK}; + skip 'no network', 1 unless $ENV{TEST_WITH_NETWORK}; my $se = Zonemaster::LDNS->new( '192.36.144.107' ); my $pt = $se->query( 'se', 'TXT' ); @@ -93,7 +93,7 @@ subtest 'TXT' => sub { subtest 'DNSKEY' => sub { SKIP: { - skip 'no network', 1 if $ENV{TEST_NO_NETWORK}; + skip 'no network', 1 unless $ENV{TEST_WITH_NETWORK}; my $se = Zonemaster::LDNS->new( '192.36.144.107' ); my $pk = $se->query( 'se', 'DNSKEY' ); @@ -103,14 +103,15 @@ subtest 'DNSKEY' => sub { isa_ok( $rr, 'Zonemaster::LDNS::RR::DNSKEY' ); ok( $rr->flags == 256 or $rr->flags == 257 ); is( $rr->protocol, 3 ); - is( $rr->algorithm, 5 ); + # Alg 8 will replace 5. Now (December 2017) both are used. + ok( $rr->algorithm == 5 or $rr->algorithm == 8 ); } } }; subtest 'RRSIG' => sub { SKIP: { - skip 'no network', 1 if $ENV{TEST_NO_NETWORK}; + skip 'no network', 1 unless $ENV{TEST_WITH_NETWORK}; my $se = Zonemaster::LDNS->new( '192.36.144.107' ); my $pr = $se->query( 'se', 'RRSIG' ); @@ -121,7 +122,9 @@ subtest 'RRSIG' => sub { is( $rr->signer, 'se.' ); is( $rr->labels, 1 ); if ( $rr->typecovered eq 'DNSKEY' ) { - is( $rr->keytag, 59747 ); # .SE KSK should not change very often + # .SE KSK should not change very often. 59407 will replace 59747. + # Now (December 2017) both are used. + ok( $rr->keytag == 59747 or $rr->keytag == 59407 ); } } } @@ -129,7 +132,7 @@ subtest 'RRSIG' => sub { subtest 'NSEC' => sub { SKIP: { - skip 'no network', 1 if $ENV{TEST_NO_NETWORK}; + skip 'no network', 1 unless $ENV{TEST_WITH_NETWORK}; my $se = Zonemaster::LDNS->new( '192.36.144.107' ); my $pn = $se->query( 'se', 'NSEC' ); @@ -163,7 +166,7 @@ subtest 'From string' => sub { subtest 'DS' => sub { SKIP: { - skip 'no network', 1 if $ENV{TEST_NO_NETWORK}; + skip 'no network', 1 unless $ENV{TEST_WITH_NETWORK}; my $se = Zonemaster::LDNS->new( '192.36.144.107' ); my $pd = $se->query( 'nic.se', 'DS' ); @@ -7,7 +7,7 @@ my $rrl = Zonemaster::LDNS::Packet->new( 'foo.com', 'SOA', 'IN' )->all; $rrl->pop; SKIP: { - skip 'no network', 3 if $ENV{TEST_NO_NETWORK}; + skip 'no network', 3 unless $ENV{TEST_WITH_NETWORK}; my $s = Zonemaster::LDNS->new( '8.8.8.8' ); my $p = $s->query( 'iis.se', 'SOA' ); diff --git a/t/threads.t b/t/threads.t index 48c0086..e946ce9 100644 --- a/t/threads.t +++ b/t/threads.t @@ -5,7 +5,7 @@ use_ok('Zonemaster::LDNS'); SKIP: { my $can_use_threads = eval 'use threads; 1'; - skip 'no network or no threads', 4 if ( $ENV{TEST_NO_NETWORK} || !$can_use_threads ); + skip 'no network or no threads', 4 unless $ENV{TEST_WITH_NETWORK} and $can_use_threads; my $resolver = Zonemaster::LDNS->new('8.8.8.8'); isa_ok($resolver, 'Zonemaster::LDNS'); @@ -3,7 +3,7 @@ use Test::More; BEGIN { use_ok( 'Zonemaster::LDNS' ) } SKIP: { - skip 'no network', 5 if $ENV{TEST_NO_NETWORK}; + skip 'no network', 5 unless $ENV{TEST_WITH_NETWORK}; my $res = new_ok( 'Zonemaster::LDNS', ['8.8.4.4'] ); |