Test suite: wait for ERROR message on QUIT

Wait for the "ERROR :Closing connection" message sent by ngIRCd when
handling the QUIT command, do not wait for "Connection closed" which is
actually output by the telnet(1) command and is implementation
dependant! For example, on Haiku OS, this is not always(!) echoed (the
command seems to hang sometimes?) which results in unpredictable
failures in the test suite ...

diff --git a/src/testsuite/channel-test.e b/src/testsuite/channel-test.e
index f65c519652779a19603feea517cd9ac810ae8cef..5e0afab3ac9621b446ac25210c9cf66822c18555 100644 (file)
--- a/src/testsuite/channel-test.e
+++ b/src/testsuite/channel-test.e
@@ -103,5 +103,5 @@ expect {
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "Connection closed"
+       "ERROR :Closing connection"
 }

diff --git a/src/testsuite/check-idle.e b/src/testsuite/check-idle.e
index ad112b25688ded0ab204b9feafb6372be1b5486b..3c37e80be30c637caac9252efe3db66774a416cb 100644 (file)
--- a/src/testsuite/check-idle.e
+++ b/src/testsuite/check-idle.e
@@ -25,7 +25,7 @@ expect {
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "Connection closed"
+       "ERROR :Closing connection"
 }
 
 exit $r

diff --git a/src/testsuite/connect-ssl-cert1-test.e b/src/testsuite/connect-ssl-cert1-test.e
index 5eb998b323a026f36d7ae383ea684e68fb658a9e..37abb762458f13f53449b56df66a0603d135e1fb 100644 (file)
--- a/src/testsuite/connect-ssl-cert1-test.e
+++ b/src/testsuite/connect-ssl-cert1-test.e
@@ -17,5 +17,5 @@ expect {
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "Connection closed"
+       "ERROR :Closing connection"
 }

diff --git a/src/testsuite/connect-ssl-cert2-test.e b/src/testsuite/connect-ssl-cert2-test.e
index cc10a1ed984085bbb524246dd167ebd867641740..0e67d75bdd6c8b9e7affb30e89bef5b12efdecef 100644 (file)
--- a/src/testsuite/connect-ssl-cert2-test.e
+++ b/src/testsuite/connect-ssl-cert2-test.e
@@ -17,6 +17,5 @@ expect {
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "Connection closed"
+       "ERROR :Closing connection"
 }
-

diff --git a/src/testsuite/connect-test.e b/src/testsuite/connect-test.e
index b51be0dbdb1aad0559c822fd6e675999f470413d..f3015d8ad71d05113667bcee0ecc41ad098bb569 100644 (file)
--- a/src/testsuite/connect-test.e
+++ b/src/testsuite/connect-test.e
@@ -16,5 +16,5 @@ expect {
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "Connection closed"
+       "ERROR :Closing connection"
 }

diff --git a/src/testsuite/invite-test.e b/src/testsuite/invite-test.e
index b9e0c3f96d213f688a16c6fd471eb73c62485cec..f3115a3d10da6f352b03a1de007f3587d7cdcce6 100644 (file)
--- a/src/testsuite/invite-test.e
+++ b/src/testsuite/invite-test.e
@@ -110,5 +110,5 @@ expect {
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "Connection closed"
+       "ERROR :Closing connection"
 }

diff --git a/src/testsuite/join-test.e b/src/testsuite/join-test.e
index 643dde42eec5490feba9acf923b818a85d478fe8..7e6a29a314722a0e42fc52f99a29d0752a0f4828 100644 (file)
--- a/src/testsuite/join-test.e
+++ b/src/testsuite/join-test.e
@@ -108,5 +108,5 @@ expect {
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "Connection closed"
+       "ERROR :Closing connection"
 }

diff --git a/src/testsuite/kick-test.e b/src/testsuite/kick-test.e
index 89da611dc27f6fcfec7b0f992eb86d916fbd0ac6..a8038796a437a3459c5b74a31ffd24010fc92d88 100644 (file)
--- a/src/testsuite/kick-test.e
+++ b/src/testsuite/kick-test.e
@@ -109,5 +109,5 @@ expect {
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "Connection closed"
+       "ERROR :Closing connection"
 }

diff --git a/src/testsuite/message-test.e b/src/testsuite/message-test.e
index 9eb22e77896fd0bd6241059147c3093861d1ecd0..28d4a93f414d9aacce632a9b5a4757e0b3f5da08 100644 (file)
--- a/src/testsuite/message-test.e
+++ b/src/testsuite/message-test.e
@@ -148,5 +148,5 @@ expect {
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "Connection closed"
+       "ERROR :Closing connection"
 }

diff --git a/src/testsuite/misc-test.e b/src/testsuite/misc-test.e
index f69e7c3cfc4d8e3405e803835b6d8056e39c6385..8896624bd9e116078e23f4959376512f854cf285 100644 (file)
--- a/src/testsuite/misc-test.e
+++ b/src/testsuite/misc-test.e
@@ -160,5 +160,5 @@ expect {
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "ERROR"
+       "ERROR :Closing connection"
 }

diff --git a/src/testsuite/mode-test.e b/src/testsuite/mode-test.e
index 86e4f2df67595d5ba71dc436865832149d7d6da9..668e57c69c04a84e311c49ca13cb9ea9311fd337 100644 (file)
--- a/src/testsuite/mode-test.e
+++ b/src/testsuite/mode-test.e
@@ -171,5 +171,5 @@ expect {
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "Connection closed"
+       "ERROR :Closing connection"
 }

diff --git a/src/testsuite/opless-channel-test.e b/src/testsuite/opless-channel-test.e
index 4611fe17fc5f791920805bea4257a65f9914e109..cd4f9a0bc067f9714d0c7b54ab3aa523e13a2a45 100644 (file)
--- a/src/testsuite/opless-channel-test.e
+++ b/src/testsuite/opless-channel-test.e
@@ -29,5 +29,5 @@ expect {
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "Connection closed"
+       "ERROR :Closing connection"
 }

diff --git a/src/testsuite/server-link-test.e b/src/testsuite/server-link-test.e
index 910f8c8457ee40cf22f536a5a5496e61cbec0027..48230afe7a200eea672d1818875f897bd561dbce 100644 (file)
--- a/src/testsuite/server-link-test.e
+++ b/src/testsuite/server-link-test.e
@@ -46,5 +46,5 @@ expect {
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "ERROR"
+       "ERROR :Closing connection"
 }

diff --git a/src/testsuite/stress-B.e b/src/testsuite/stress-B.e
index 95156cbb552041a88222bb27a9ca3f4d7481c646..53c75a040ce380db9ead1eda158f48a7b1cbd304 100644 (file)
--- a/src/testsuite/stress-B.e
+++ b/src/testsuite/stress-B.e
@@ -72,5 +72,5 @@ sleep 1
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "Connection closed"
+       "ERROR :Closing connection"
 }

diff --git a/src/testsuite/who-test.e b/src/testsuite/who-test.e
index 39e3a2f15521bafcc858f1dec8c66f2be1c68642..55c65702eb342805b9ab71ddbd99d5c68de78870 100644 (file)
--- a/src/testsuite/who-test.e
+++ b/src/testsuite/who-test.e
@@ -199,5 +199,5 @@ expect {
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "Connection closed"
+       "ERROR :Closing connection"
 }

diff --git a/src/testsuite/whois-test.e b/src/testsuite/whois-test.e
index 44eee6689d2ea18cf159a338dcc1b8d17a2888ec..74442ed49bfb54f4162cc29aa1ff9996c2bb3e37 100644 (file)
--- a/src/testsuite/whois-test.e
+++ b/src/testsuite/whois-test.e
@@ -73,5 +73,5 @@ expect {
 send "quit\r"
 expect {
        timeout { exit 1 }
-       "ERROR"
+       "ERROR :Closing connection"
 }