| 1 | From 7379afce07b19c04a1927172ddd2ebb9213d87fa Mon Sep 17 00:00:00 2001
|
| 2 | From: Robert Scheck <[email protected]>
|
| 3 | Date: Sat, 1 Mar 2025 15:29:17 +0100
|
| 4 | Subject: [PATCH] Skip DNS tests without network access (#83)
|
| 5 |
|
| 6 | $ make test
|
| 7 | prove -It/lib --recurse t
|
| 8 | t/actions.t ... ok
|
| 9 | t/antispam.t .. ok
|
| 10 | t/arc.t ....... ok
|
| 11 | t/authres.t ... ok
|
| 12 | t/core.t ...... ok
|
| 13 | t/critic.t .... skipped: Author test. Set $ENV{TEST_AUTHOR} to a true value to run.
|
| 14 | t/dates.t ..... ok
|
| 15 | t/dkim.t ...... ok
|
| 16 | t/headers.t ... ok
|
| 17 | t/mime.t ...... ok
|
| 18 | t/net.t .......
|
| 19 | Dubious, test returned 3 (wstat 768, 0x300)
|
| 20 | Failed 3/15 subtests
|
| 21 | (less 3 skipped subtests: 9 okay)
|
| 22 | t/relay.t ..... ok
|
| 23 | t/sender.t .... ok
|
| 24 | t/smtp.t ...... ok
|
| 25 | t/spf.t ....... ok
|
| 26 | t/utils.t ..... ok
|
| 27 | Test Summary Report
|
| 28 | -------------------
|
| 29 | t/net.t (Wstat: 768 (exited 3) Tests: 15 Failed: 3)
|
| 30 | Failed tests: 5-6, 11
|
| 31 | Non-zero exit status: 3
|
| 32 | Files=16, Tests=130, 680 wallclock secs ( 0.05 usr 0.03 sys + 3.91 cusr 0.71 csys = 4.70 CPU)
|
| 33 | Result: FAIL
|
| 34 | make: *** [Makefile:365: test] Error 1
|
| 35 | ---
|
| 36 | t/net.t | 28 +++++++++++++++++++++++-----
|
| 37 | 1 file changed, 23 insertions(+), 5 deletions(-)
|
| 38 |
|
| 39 | diff --git a/t/net.t b/t/net.t
|
| 40 | index 4710ce2..69e1877 100644
|
| 41 | |
| 42 | |
| 43 | @@ -55,7 +55,13 @@ sub t_reverse_ip : Test(2)
|
| 44 | sub t_get_ptr_record : Test(1)
|
| 45 | {
|
| 46 | my $ipv4 = '1.1.1.1';
|
| 47 | - is(Mail::MIMEDefang::Net::get_ptr_record($ipv4), 'one.one.one.one');
|
| 48 | +
|
| 49 | + SKIP: {
|
| 50 | + if ( (not defined $ENV{'NET_TEST'}) or ($ENV{'NET_TEST'} ne 'yes' )) {
|
| 51 | + skip "Net test disabled", 1
|
| 52 | + }
|
| 53 | + is(Mail::MIMEDefang::Net::get_ptr_record($ipv4), 'one.one.one.one');
|
| 54 | + }
|
| 55 | }
|
| 56 |
|
| 57 | sub t_relay_is_blacklisted_multi : Test(1)
|
| 58 | @@ -107,15 +113,27 @@ sub t_email_is_blacklisted : Test(1)
|
| 59 | sub t_md_get_bogus_mx_hosts : Test(1)
|
| 60 | {
|
| 61 | my $domain = 'multihomed.dnsbltest.spamassassin.org';
|
| 62 | - my @res = md_get_bogus_mx_hosts($domain);
|
| 63 | - is(scalar @res, 1);
|
| 64 | +
|
| 65 | + SKIP: {
|
| 66 | + if ( (not defined $ENV{'NET_TEST'}) or ($ENV{'NET_TEST'} ne 'yes' )) {
|
| 67 | + skip "Net test disabled", 1
|
| 68 | + }
|
| 69 | + my @res = md_get_bogus_mx_hosts($domain);
|
| 70 | + is(scalar @res, 1);
|
| 71 | + }
|
| 72 | }
|
| 73 |
|
| 74 | sub t_get_mx_ip_addresses : Test(1)
|
| 75 | {
|
| 76 | my $domain = 'mimedefang.org';
|
| 77 | - my @res = get_mx_ip_addresses($domain);
|
| 78 | - is(scalar @res, 2);
|
| 79 | +
|
| 80 | + SKIP: {
|
| 81 | + if ( (not defined $ENV{'NET_TEST'}) or ($ENV{'NET_TEST'} ne 'yes' )) {
|
| 82 | + skip "Net test disabled", 1
|
| 83 | + }
|
| 84 | + my @res = get_mx_ip_addresses($domain);
|
| 85 | + is(scalar @res, 2);
|
| 86 | + }
|
| 87 | }
|
| 88 |
|
| 89 | __PACKAGE__->runtests();
|