Commit Diff

Commit:
31b3c83c1f1b18fa1ed0501e95ed8e5f6cc6d407
From:
Alexander Barton <alex@barton.de>
Date:
Message:
Merge remote-tracking branch 'alex/TestsuiteNoDNS' * alex/TestsuiteNoDNS: Test suite: Don't use DNS lookups
Actions:
Patch | Tree
commit - 6e4235443eb4dee0930a65e613c8bf5e00331f73
commit + 31b3c83c1f1b18fa1ed0501e95ed8e5f6cc6d407
blob - dd7eb66d20e5f9c6a8f7583041af25a854fec362
blob + 39ad16a94ee4da3c454433bae5fdbfc3b6a696c9
--- src/testsuite/channel-test.e
+++ src/testsuite/channel-test.e
@@ -1,7 +1,7 @@
 # ngIRCd test suite
 # Channel test
 
-spawn telnet localhost 6789
+spawn telnet 127.0.0.1 6789
 expect {
 	timeout { exit 1 }
 	"Connected"
blob - 41b8eb49ce34105963f554944d933932d4ed53dd
blob + ad112b25688ded0ab204b9feafb6372be1b5486b
--- src/testsuite/check-idle.e
+++ src/testsuite/check-idle.e
@@ -1,7 +1,7 @@
 # ngIRCd test suite
 # Idle test
 
-spawn telnet localhost 6789
+spawn telnet 127.0.0.1 6789
 expect {
 	timeout { exit 1 }
 	"Connected"
blob - 662f5f7a580f6b266be2aa5161a0b7a0f05d95ca
blob + b51be0dbdb1aad0559c822fd6e675999f470413d
--- src/testsuite/connect-test.e
+++ src/testsuite/connect-test.e
@@ -1,7 +1,7 @@
 # ngIRCd test suite
 # Server connect test
 
-spawn telnet localhost 6789
+spawn telnet 127.0.0.1 6789
 expect {
 	timeout { exit 1 }
 	"Connected"
blob - 3716d1975fa614d4f693f9d65c8b3d9f42a59b22
blob + 5179d8a7934a753646363bebd724c443aefe0081
--- src/testsuite/invite-test.e
+++ src/testsuite/invite-test.e
@@ -1,7 +1,7 @@
 # ngIRCd test suite
 # INVITE test
 
-spawn telnet localhost 6789
+spawn telnet 127.0.0.1 6789
 expect {
 	timeout { exit 1 }
 	"Connected"
blob - 28b4c54faf210fa9746055a4c85f480a6bfce691
blob + c088f5cc2ea13bbbdecf42b45096f3a6df77c1c9
--- src/testsuite/join-test.e
+++ src/testsuite/join-test.e
@@ -1,7 +1,7 @@
 # ngIRCd test suite
 # JOIN test
 
-spawn telnet localhost 6789
+spawn telnet 127.0.0.1 6789
 expect {
        timeout { exit 1 }
        "Connected"
blob - 3d3c1ee9bd7af0fbb770ff77834ae5f3b65068c2
blob + 89da611dc27f6fcfec7b0f992eb86d916fbd0ac6
--- src/testsuite/kick-test.e
+++ src/testsuite/kick-test.e
@@ -1,7 +1,7 @@
 # ngIRCd test suite
 # KICK test
 
-spawn telnet localhost 6789
+spawn telnet 127.0.0.1 6789
 expect {
        timeout { exit 1 }
        "Connected"
blob - 0e70640e2b6ca2abd444a19eedf34aed611d3d53
blob + 5dc325ded807cd68807c8d05dc54a31451394cf0
--- src/testsuite/message-test.e
+++ src/testsuite/message-test.e
@@ -1,7 +1,7 @@
 # ngIRCd test suite
 # PRIVMSG and NOTICE test
 
-spawn telnet localhost 6789
+spawn telnet 127.0.0.1 6789
 expect {
 	timeout { exit 1 }
 	"Connected"
@@ -72,25 +72,18 @@ expect {
 	"MODE nick :-b"
 }
 
-# The following two tests using "localhost" as host name
-# had to be disabled, because there are operating systems
-# out there, that use "localhost.<domain>" as host name
-# for 127.0.0.1 instead of just "localhost".
-# (for example OpenBSD 4, OpenSolaris, ...)
-#
-#send "privmsg ~user\%localhost :test\r"
-#expect {
-#	timeout { exit 1 }
-#	"@* PRIVMSG nick :test"
-#}
-#
-#send "privmsg Nick!~User@LocalHost :test\r"
-#expect {
-#	timeout { exit 1 }
-#	"@* PRIVMSG nick :test"
-#	"401"
-#}
+send "privmsg ~user\%127.0.0.1 :test\r"
+expect {
+	timeout { exit 1 }
+	"@* PRIVMSG nick :test"
+}
 
+send "privmsg Nick!~User@127.0.0.1 :test\r"
+expect {
+	timeout { exit 1 }
+	"@* PRIVMSG nick :test"
+}
+
 send "away :away\r"
 expect {
 	timeout { exit 1 }
blob - a83bc5b43a16cc36f310906bcc6c2b14e59da914
blob + f69e7c3cfc4d8e3405e803835b6d8056e39c6385
--- src/testsuite/misc-test.e
+++ src/testsuite/misc-test.e
@@ -1,7 +1,7 @@
 # ngIRCd test suite
 # Misc test
 
-spawn telnet localhost 6789
+spawn telnet 127.0.0.1 6789
 expect {
 	timeout { exit 1 }
 	"Connected"
@@ -130,7 +130,7 @@ expect {
 send "userhost nick\r"
 expect {
 	timeout { exit 1 }
-	-re ":ngircd.test.server 302 nick :?nick=+.*@(localhos.*|127.0.0.1)"
+	-re ":ngircd.test.server 302 nick :?nick=+.*@127.0.0.1"
 }
 
 send "userhost doesnotexist\r"
@@ -142,7 +142,7 @@ expect {
 send "userhost nick doesnotexist nick doesnotexist\r"
 expect {
 	timeout { exit 1 }
-	-re ":ngircd.test.server 302 nick :nick=+.*@(localhos.*|127.0.0.1) nick=+.*@(localhos.*|127.0.0.1)"
+	-re ":ngircd.test.server 302 nick :nick=+.*@127.0.0.1 nick=+.*@127.0.0.1"
 }
 
 send "away :testing\r"
@@ -154,7 +154,7 @@ expect {
 send "userhost nick nick nick nick nick nick\r"
 expect {
 	timeout { exit 1 }
-	-re ":ngircd.test.server 302 nick :nick=-.*@(localhos.*|127.0.0.1) nick=-.*@(localhos.*|127.0.0.1) nick=-.*@(localhos.*|127.0.0.1) nick=-.*@(localhos.*|127.0.0.1) nick=-.*@(localhos.*|127.0.0.1)\r"
+	-re ":ngircd.test.server 302 nick :nick=-.*@127.0.0.1 nick=-.*@127.0.0.1 nick=-.*@127.0.0.1 nick=-.*@127.0.0.1 nick=-.*@127.0.0.1\r"
 }
 
 send "quit\r"
blob - d6726a4385e3437cbbfbf57de5726fa3e3071388
blob + 86e4f2df67595d5ba71dc436865832149d7d6da9
--- src/testsuite/mode-test.e
+++ src/testsuite/mode-test.e
@@ -1,7 +1,7 @@
 # ngIRCd test suite
 # MODE test
 
-spawn telnet localhost 6789
+spawn telnet 127.0.0.1 6789
 expect {
 	timeout { exit 1 }
 	"Connected"
blob - 0d0cccc9ce3b669b280cb0a26dd9f1d78df6d72e
blob + 4dec5330ecc680ecae6c44f9008a2c5546417724
--- src/testsuite/ngircd-test1.conf
+++ src/testsuite/ngircd-test1.conf
@@ -17,6 +17,7 @@
 	OperCanUseMode = yes
 	Ident = no
 	IncludeDir = /var/empty
+	DNS = no
 	PAM = no
 
 [Operator]
blob - c9d7f6c5b4b02f44144318b8e4f67cc2790e874b
blob + 0d24c4a45abf2f3f51863df0a8570968b6024c6c
--- src/testsuite/ngircd-test2.conf
+++ src/testsuite/ngircd-test2.conf
@@ -17,6 +17,7 @@
 	OperCanUseMode = yes
 	Ident = no
 	IncludeDir = /var/empty
+	DNS = no
 	PAM = no
 
 [Operator]
blob - 7d941720afb5689e08a1ce04175ffc5a0af66c02
blob + 4611fe17fc5f791920805bea4257a65f9914e109
--- src/testsuite/opless-channel-test.e
+++ src/testsuite/opless-channel-test.e
@@ -1,7 +1,7 @@
 # ngIRCd test suite
 # Op-less channel test
 
-spawn telnet localhost 6789
+spawn telnet 127.0.0.1 6789
 expect {
        timeout { exit 1 }
        "Connected"
blob - cf3fae80099ee652d48e23b2c91b2591a3d35b65
blob + 910f8c8457ee40cf22f536a5a5496e61cbec0027
--- src/testsuite/server-link-test.e
+++ src/testsuite/server-link-test.e
@@ -1,7 +1,7 @@
 # ngIRCd test suite
 # server-server link test
 
-spawn telnet localhost 6790
+spawn telnet 127.0.0.1 6790
 expect {
 	timeout { exit 1 }
 	"Connected"
blob - 256d5d1fb35cba4a04dad169e596f39cbb5c4967
blob + d51adaa4de7803f3d7dba59a5657a666b5f18129
--- src/testsuite/stress-A.e
+++ src/testsuite/stress-A.e
@@ -3,7 +3,7 @@
 
 set timeout 30
 
-spawn telnet localhost 6789
+spawn telnet 127.0.0.1 6789
 expect {
 	timeout { exit 1 }
 	"Connected"
blob - a41e6b6a68574f394ef68731948a1ec4764f3bd0
blob + 39d50eded65897aa0bb35bcde709f443130365cf
--- src/testsuite/who-test.e
+++ src/testsuite/who-test.e
@@ -1,7 +1,7 @@
 # ngIRCd test suite
 # WHO test
 
-spawn telnet localhost 6789
+spawn telnet 127.0.0.1 6789
 expect {
 	timeout { exit 1 }
 	"Connected"
@@ -62,7 +62,7 @@ expect {
 	":ngircd.test.server 352 nick #channel * * ngircd.test.server nick G@ :0 Real Name"
 }
 
-send "who localhos*\r"
+send "who 127.0.0.*\r"
 expect {
 	timeout { exit 1 }
 	":ngircd.test.server 352 nick \* * * ngircd.test.server nick G :0 Real Name"
@@ -120,7 +120,7 @@ expect {
 	"305 nick"
 }
 
-send "who ??cal*ho*\r"
+send "who ??7.*0*\r"
 expect {
 	timeout { exit 1 }
 	":ngircd.test.server 352 nick \* * * ngircd.test.server nick H* :0 Real Name"
blob - 16b1184b9861eed4146d8ceb0597d2e02ce1dd3a
blob + 44eee6689d2ea18cf159a338dcc1b8d17a2888ec
--- src/testsuite/whois-test.e
+++ src/testsuite/whois-test.e
@@ -1,7 +1,7 @@
 # ngIRCd test suite
 # WHOIS test
 
-spawn telnet localhost 6789
+spawn telnet 127.0.0.1 6789
 expect {
 	timeout { exit 1 }
 	"Connected"
@@ -17,7 +17,7 @@ expect {
 send "whois nick\r"
 expect {
 	timeout { exit 1 }
-	"311 nick nick ~user localhost* \* :Real Name\r"
+	"311 nick nick ~user 127.0.0.1 \* :Real Name\r"
 }
 expect {
 	timeout { exit 1 }
@@ -27,25 +27,25 @@ expect {
 send "whois *\r"
 expect {
 	timeout { exit 1 }
-	"311 nick nick ~user localhost* \* :Real Name\r"
+	"311 nick nick ~user 127.0.0.1* \* :Real Name\r"
 }
 
 send "whois n*\r"
 expect {
 	timeout { exit 1 }
-	"311 nick nick ~user localhost* \* :Real Name\r"
+	"311 nick nick ~user 127.0.0.1* \* :Real Name\r"
 }
 
 send "whois ?ick\r"
 expect {
 	timeout { exit 1 }
-	"311 nick nick ~user localhost* \* :Real Name\r"
+	"311 nick nick ~user 127.0.0.1* \* :Real Name\r"
 }
 
 send "whois ????,n?*k\r"
 expect {
 	timeout { exit 1 }
-	"311 nick nick ~user localhost* \* :Real Name\r"
+	"311 nick nick ~user 127.0.0.1* \* :Real Name\r"
 }
 
 send "whois unknown\r"
@@ -61,7 +61,7 @@ expect {
 send "whois ngircd.test.server2 nick\r"
 expect {
 	timeout { exit 1 }
-	":ngircd.test.server2 311 nick nick ~user localhost* \* :Real Name\r"
+	":ngircd.test.server2 311 nick nick ~user 127.0.0.1* \* :Real Name\r"
 }
 
 send "whois nosuchserver unknown\r"