tests: Disable the OAUTHBEARER tests when using a non-default port number

Tests 842, 843, 844, 845, 887, 888, 889, 890, 946, 947, 948 and 949 fail
if a custom port number is specified via the -b option of runtests.pl.

Suggested by: Kamil Dudka
Bug: http://curl.haxx.se/mail/lib-2015-12/0003.html

12 files changed, 48 insertions, 0 deletions

diff --git a/tests/data/test842 b/tests/data/test842
index 423335755..e0928e245 100644
--- a/tests/data/test842
+++ b/tests/data/test842
@@ -40,6 +40,10 @@ IMAP OAuth 2.0 (OAUTHBEARER) authentication
  <command>
 'imap://%HOSTIP:%IMAPPORT/842/;UID=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%IMAPPORT' ne '9003' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test843 b/tests/data/test843
index 6712c7ce5..8592c8bd1 100644
--- a/tests/data/test843
+++ b/tests/data/test843
@@ -41,6 +41,10 @@ IMAP OAuth 2.0 (OAUTHBEARER) authentication with initial response
  <command>
 'imap://%HOSTIP:%IMAPPORT/843/;UID=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%IMAPPORT' ne '9003' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test844 b/tests/data/test844
index 461ef5d60..00761065d 100644
--- a/tests/data/test844
+++ b/tests/data/test844
@@ -32,6 +32,10 @@ IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation
  <command>
 'imap://%HOSTIP:%IMAPPORT/844/;UID=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%IMAPPORT' ne '9003' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test845 b/tests/data/test845
index e98af664a..915327bde 100644
--- a/tests/data/test845
+++ b/tests/data/test845
@@ -33,6 +33,10 @@ IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
  <command>
 'imap://%HOSTIP:%IMAPPORT/845/;UID=1' -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%IMAPPORT' ne '9003' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test887 b/tests/data/test887
index 92a0e88f0..70afef744 100644
--- a/tests/data/test887
+++ b/tests/data/test887
@@ -42,6 +42,10 @@ POP3 OAuth 2.0 (OAUTHBEARER) authentication
  <command>
 pop3://%HOSTIP:%POP3PORT/887 -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%POP3PORT' ne '9001' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test888 b/tests/data/test888
index 63a9b6ede..5f9bee1ad 100644
--- a/tests/data/test888
+++ b/tests/data/test888
@@ -42,6 +42,10 @@ POP3 OAuth 2.0 (OAUTHBEARER) authentication with initial response
  <command>
 pop3://%HOSTIP:%POP3PORT/888 -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%POP3PORT' ne '9001' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test889 b/tests/data/test889
index 9b8a024f0..f016934a0 100644
--- a/tests/data/test889
+++ b/tests/data/test889
@@ -34,6 +34,10 @@ POP3 OAuth 2.0 (OAUTHBEARER) failure as continuation
  <command>
 pop3://%HOSTIP:%POP3PORT/889 -u user --oauth2-bearer mF_9.B5f-4.1JqM
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%POP3PORT' ne '9001' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test890 b/tests/data/test890
index 819e9d36a..e179f8bc8 100644
--- a/tests/data/test890
+++ b/tests/data/test890
@@ -34,6 +34,10 @@ POP3 OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
  <command>
 pop3://%HOSTIP:%POP3PORT/890 -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%POP3PORT' ne '9001' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test946 b/tests/data/test946
index 313fd2166..c052afaf7 100644
--- a/tests/data/test946
+++ b/tests/data/test946
@@ -35,6 +35,10 @@ mail body
  <command>
 smtp://%HOSTIP:%SMTPPORT/946 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%SMTPPORT' ne '9005' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test947 b/tests/data/test947
index ad7cd78cb..f33db5e5b 100644
--- a/tests/data/test947
+++ b/tests/data/test947
@@ -35,6 +35,10 @@ mail body
  <command>
 smtp://%HOSTIP:%SMTPPORT/947 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%SMTPPORT' ne '9005' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test948 b/tests/data/test948
index 317934d1b..510eb9aa2 100644
--- a/tests/data/test948
+++ b/tests/data/test948
@@ -36,6 +36,10 @@ mail body
  <command>
 smtp://%HOSTIP:%SMTPPORT/948 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%SMTPPORT' ne '9005' );"
+</precheck>
 </client>
 
 #
diff --git a/tests/data/test949 b/tests/data/test949
index c78407db8..bebf46646 100644
--- a/tests/data/test949
+++ b/tests/data/test949
@@ -36,6 +36,10 @@ mail body
  <command>
 smtp://%HOSTIP:%SMTPPORT/949 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -
 </command>
+# The data section doesn't do variable substitution, so we must assert this
+<precheck>
+perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%SMTPPORT' ne '9005' );"
+</precheck>
 </client>
 
 #