From eeb4f4f0c612aa5f5551073d64307468a740487e Mon Sep 17 00:00:00 2001 From: Tim Kimber Date: Mon, 31 Oct 2022 14:30:08 +0000 Subject: [PATCH] Move some tests to afraid.org --- test/u1-test-get_auth_dns-dig.bats | 10 +++++----- test/u2-test-get_auth_dns-drill.bats | 10 +++++----- test/u7-test-get_auth_dns-nslookup.bats | 20 ++++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/test/u1-test-get_auth_dns-dig.bats b/test/u1-test-get_auth_dns-dig.bats index 03f70cd..72d93e8 100644 --- a/test/u1-test-get_auth_dns-dig.bats +++ b/test/u1-test-get_auth_dns-dig.bats @@ -53,21 +53,21 @@ teardown() { # Disable CNAME check _TEST_SKIP_CNAME_CALL=1 - PUBLIC_DNS_SERVER=ns1.duckdns.org + PUBLIC_DNS_SERVER=ns1.afraid.org CHECK_PUBLIC_DNS_SERVER=false CHECK_ALL_AUTH_DNS=false - run get_auth_dns ubuntu-getssl.duckdns.org + run get_auth_dns ubuntu-getssl.ignorelist.com # Assert that we've found the primary_ns server - assert_output --regexp 'set primary_ns = ns[1-9]+\.duckdns\.org' + assert_output --regexp 'set primary_ns = ns[1-3]+\.afraid\.org' # Assert that we had to use dig NS assert_line --regexp 'Using dig.* NS' # Check all Authoritive DNS servers are returned if requested CHECK_ALL_AUTH_DNS=true - run get_auth_dns ubuntu-getssl.duckdns.org - assert_output --regexp 'set primary_ns = (ns[1-9]+\.duckdns\.org )+' + run get_auth_dns ubuntu-getssl.ignorelist.com + assert_output --regexp 'set primary_ns = (ns[1-3]+\.afraid\.org ?)+' } diff --git a/test/u2-test-get_auth_dns-drill.bats b/test/u2-test-get_auth_dns-drill.bats index 57b913f..3ac8a87 100644 --- a/test/u2-test-get_auth_dns-drill.bats +++ b/test/u2-test-get_auth_dns-drill.bats @@ -59,21 +59,21 @@ teardown() { _TEST_SKIP_CNAME_CALL=1 _TEST_SKIP_SOA_CALL=1 - PUBLIC_DNS_SERVER=ns1.duckdns.org + PUBLIC_DNS_SERVER=ns1.afraid.org CHECK_PUBLIC_DNS_SERVER=false CHECK_ALL_AUTH_DNS=false - run get_auth_dns ubuntu-getssl.duckdns.org + run get_auth_dns ubuntu-getssl.ignorelist.com # Assert that we've found the primary_ns server - assert_output --regexp 'set primary_ns = ns[1-9]+\.duckdns\.org' + assert_output --regexp 'set primary_ns = ns[1-3]+\.afraid\.org' # Assert that we had to use drill NS assert_line --regexp 'Using drill.* NS' # Check all Authoritive DNS servers are returned if requested CHECK_ALL_AUTH_DNS=true - run get_auth_dns ubuntu-getssl.duckdns.org - assert_output --regexp 'set primary_ns = (ns[1-9]+\.duckdns\.org )+' + run get_auth_dns ubuntu-getssl.ignorelist.com + assert_output --regexp 'set primary_ns = (ns[1-3]+\.afraid\.org ?)+' } diff --git a/test/u7-test-get_auth_dns-nslookup.bats b/test/u7-test-get_auth_dns-nslookup.bats index 597a652..d8ada2c 100644 --- a/test/u7-test-get_auth_dns-nslookup.bats +++ b/test/u7-test-get_auth_dns-nslookup.bats @@ -65,17 +65,17 @@ teardown() { CHECK_PUBLIC_DNS_SERVER=false CHECK_ALL_AUTH_DNS=false - run get_auth_dns ubuntu-getssl.duckdns.org + run get_auth_dns ubuntu-getssl.ignorelist.com # Assert that we've found the primary_ns server - #assert_output --regexp 'set primary_ns = ns[1-9]+\.duckdns\.org' + #assert_output --regexp 'set primary_ns = ns[1-3]+\.afraid\.org' # Assert that we had to use dig NS #assert_line --regexp 'Using nslookup.* NS' # Check all Authoritive DNS servers are returned if requested CHECK_ALL_AUTH_DNS=true - run get_auth_dns _acme-challenge.ubuntu-getssl.duckdns.org - assert_output --regexp 'set primary_ns=(ns[1-9]+\.duckdns\.org )+' + run get_auth_dns _acme-challenge.ubuntu-getssl.ignorelist.com + assert_output --regexp 'set primary_ns=(ns[1-3]+\.afraid\.org )+' } @@ -92,10 +92,10 @@ teardown() { CHECK_PUBLIC_DNS_SERVER=false CHECK_ALL_AUTH_DNS=false - run get_auth_dns _acme-challenge.ubuntu-getssl.duckdns.org + run get_auth_dns _acme-challenge.ubuntu-getssl.ignorelist.com # Assert that we've found the primary_ns server - assert_output --regexp 'set primary_ns=ns[1-9]+\.duckdns\.org' + assert_output --regexp 'set primary_ns=ns[1-3]+\.afraid\.org' # Assert that we had to use nslookup NS assert_line --regexp 'Using nslookup.*-type=soa' @@ -103,13 +103,13 @@ teardown() { # Check all Authoritive DNS servers are returned if requested CHECK_ALL_AUTH_DNS=true - run get_auth_dns _acme-challenge.ubuntu-getssl.duckdns.org - assert_output --regexp 'set primary_ns=(ns[1-9]+\.duckdns\.org )+' + run get_auth_dns _acme-challenge.ubuntu-getssl.ignorelist.com + assert_output --regexp 'set primary_ns=(ns[1-3]+\.afraid\.org )+' # Check that we also check the public DNS server if requested CHECK_PUBLIC_DNS_SERVER=true - run get_auth_dns _acme-challenge.ubuntu-getssl.duckdns.org - assert_output --regexp 'set primary_ns=(ns[1-9]+\.duckdns\.org )+ 1\.0\.0\.1' + run get_auth_dns _acme-challenge.ubuntu-getssl.ignorelist.com + assert_output --regexp 'set primary_ns=(ns[1-3]+\.afraid\.org )+ 1\.0\.0\.1' }