Fix tests (new duckdns servers)

test/u1-test-get_auth_dns-dig.bats

@@ -59,14 +59,14 @@ teardown() {
     run get_auth_dns ubuntu-getssl.duckdns.org
 
     # Assert that we've found the primary_ns server
-    assert_output --regexp 'set primary_ns = ns[1-4]+\.duckdns\.org'
+    assert_output --regexp 'set primary_ns = ns[1-9]+\.duckdns\.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-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org'
+    assert_output --regexp 'set primary_ns = (ns[1-9]+\.duckdns\.org )+'
 }
 
 
@@ -86,7 +86,7 @@ teardown() {
     run get_auth_dns ubuntu-getssl.duckdns.org
 
     # Assert that we've found the primary_ns server
-    assert_output --regexp 'set primary_ns = ns[1-4]+\.duckdns\.org'
+    assert_output --regexp 'set primary_ns = ns[1-9]+\.duckdns\.org'
 
     # Assert that we had to use dig NS
     assert_line --regexp 'Using dig.* SOA'
@@ -95,12 +95,12 @@ teardown() {
     # 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-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org'
+    assert_output --regexp 'set primary_ns = (ns[1-9]+\.duckdns\.org )+'
 
     # Check that we also check the public DNS server if requested
     CHECK_PUBLIC_DNS_SERVER=true
     run get_auth_dns ubuntu-getssl.duckdns.org
-    assert_output --regexp 'set primary_ns = ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org 1\.0\.0\.1'
+    assert_output --regexp 'set primary_ns = (ns[1-9]+\.duckdns\.org )+1\.0\.0\.1'
 }
 
 
@@ -122,7 +122,7 @@ teardown() {
     run get_auth_dns www.duckdns.org
 
     # Assert that we've found the primary_ns server
-    assert_output --regexp 'set primary_ns = ns.*\.awsdns.*\.com'
+    assert_output --regexp 'set primary_ns = ns.*\.awsdns.*\.net'
 
     # Assert that we found a CNAME and use dig NS
     assert_line --regexp 'Using dig.* CNAME'
@@ -131,12 +131,12 @@ teardown() {
     # Check all Authoritive DNS servers are returned if requested
     CHECK_ALL_AUTH_DNS=true
     run get_auth_dns www.duckdns.org
-    assert_output --regexp 'set primary_ns = ns.*\.awsdns.*\.com'
+    assert_output --regexp 'set primary_ns = ns.*\.awsdns.*\.net'
 
     # Check that we also check the public DNS server if requested
     CHECK_PUBLIC_DNS_SERVER=true
     run get_auth_dns www.duckdns.org
-    assert_output --regexp 'set primary_ns = ns.*\.awsdns.*\.com 1\.0\.0\.1'
+    assert_output --regexp 'set primary_ns = ns.*\.awsdns.*\.net 1\.0\.0\.1'
 }
 
 
@@ -165,7 +165,7 @@ teardown() {
     run get_auth_dns www.duckdns.org
 
     # Assert that we've found the primary_ns server
-    assert_output --regexp 'set primary_ns = ns[1-4]+\.duckdns\.org'
+    assert_output --regexp 'set primary_ns = ns[1-9]+\.duckdns\.org'
 
     # Assert that we found a CNAME but didn't use dig NS
     assert_line --regexp 'Using dig.* CNAME'
@@ -174,5 +174,5 @@ teardown() {
     # Check all Authoritive DNS servers are returned if requested
     CHECK_ALL_AUTH_DNS=true
     run get_auth_dns www.duckdns.org
-    assert_output --regexp 'set primary_ns = ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org'
+    assert_output --regexp 'set primary_ns = (ns[1-9]+\.duckdns\.org )+'
 }

test/u2-test-get_auth_dns-drill.bats

@@ -65,14 +65,14 @@ teardown() {
     run get_auth_dns ubuntu-getssl.duckdns.org
 
     # Assert that we've found the primary_ns server
-    assert_output --regexp 'set primary_ns = ns[1-4]+\.duckdns\.org'
+    assert_output --regexp 'set primary_ns = ns[1-9]+\.duckdns\.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-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org'
+    assert_output --regexp 'set primary_ns = (ns[1-9]+\.duckdns\.org )+'
 }
 
 
@@ -97,7 +97,7 @@ teardown() {
     run get_auth_dns ubuntu-getssl.duckdns.org
 
     # Assert that we've found the primary_ns server
-    assert_output --regexp 'set primary_ns = ns[1-4]+\.duckdns\.org'
+    assert_output --regexp 'set primary_ns = ns[1-9]+\.duckdns\.org'
 
     # Assert that we had to use drill NS
     assert_line --regexp 'Using drill.* SOA'
@@ -106,12 +106,12 @@ teardown() {
     # 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-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org'
+    assert_output --regexp 'set primary_ns = (ns[1-9]+\.duckdns\.org )+'
 
     # Check that we also check the public DNS server if requested
     CHECK_PUBLIC_DNS_SERVER=true
     run get_auth_dns ubuntu-getssl.duckdns.org
-    assert_output --regexp 'set primary_ns = ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org 1\.0\.0\.1'
+    assert_output --regexp 'set primary_ns = (ns[1-9]+\.duckdns\.org )+1\.0\.0\.1'
 }
 
 
@@ -138,7 +138,7 @@ teardown() {
     run get_auth_dns www.duckdns.org
 
     # Assert that we've found the primary_ns server
-    assert_output --regexp 'set primary_ns = ns.*\.awsdns.*\.com'
+    assert_output --regexp 'set primary_ns = ns.*\.awsdns.*\.net'
 
     # Assert that we found a CNAME and use drill NS
     assert_line --regexp 'Using drill.* CNAME'
@@ -147,12 +147,12 @@ teardown() {
     # Check all Authoritive DNS servers are returned if requested
     CHECK_ALL_AUTH_DNS=true
     run get_auth_dns www.duckdns.org
-    assert_output --regexp 'set primary_ns = ns.*\.awsdns.*\.com'
+    assert_output --regexp 'set primary_ns = ns.*\.awsdns.*\.net'
 
     # Check that we also check the public DNS server if requested
     CHECK_PUBLIC_DNS_SERVER=true
     run get_auth_dns www.duckdns.org
-    assert_output --regexp 'set primary_ns = ns.*\.awsdns.*\.com 1\.0\.0\.1'
+    assert_output --regexp 'set primary_ns = ns.*\.awsdns.*\.net 1\.0\.0\.1'
 }
 
 
@@ -189,7 +189,7 @@ teardown() {
     run get_auth_dns www.duckdns.org
 
     # Assert that we've found the primary_ns server
-    assert_output --regexp 'set primary_ns = ns[1-4]+\.duckdns\.org'
+    assert_output --regexp 'set primary_ns = ns[1-9]+\.duckdns\.org'
 
     # Assert that we found a CNAME but didn't use drill NS
     assert_line --regexp 'Using drill.* CNAME'
@@ -198,5 +198,5 @@ teardown() {
     # Check all Authoritive DNS servers are returned if requested
     CHECK_ALL_AUTH_DNS=true
     run get_auth_dns www.duckdns.org
-    assert_output --regexp 'set primary_ns = ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org ns[1-4]+\.duckdns\.org'
+    assert_output --regexp 'set primary_ns = (ns[1-9]+\.duckdns\.org )+'
 }