Merge remote-tracking branch 'alex/TestsuiteNoDNS'

* alex/TestsuiteNoDNS:
  Test suite: Don't use DNS lookups

diff --git a/src/testsuite/channel-test.e b/src/testsuite/channel-test.e
index dd7eb66d20e5f9c6a8f7583041af25a854fec362..39ad16a94ee4da3c454433bae5fdbfc3b6a696c9 100644 (file)
--- a/src/testsuite/channel-test.e
+++ b/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"

diff --git a/src/testsuite/check-idle.e b/src/testsuite/check-idle.e
index 41b8eb49ce34105963f554944d933932d4ed53dd..ad112b25688ded0ab204b9feafb6372be1b5486b 100644 (file)
--- a/src/testsuite/check-idle.e
+++ b/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"

diff --git a/src/testsuite/connect-test.e b/src/testsuite/connect-test.e
index 662f5f7a580f6b266be2aa5161a0b7a0f05d95ca..b51be0dbdb1aad0559c822fd6e675999f470413d 100644 (file)
--- a/src/testsuite/connect-test.e
+++ b/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"

diff --git a/src/testsuite/invite-test.e b/src/testsuite/invite-test.e
index 3716d1975fa614d4f693f9d65c8b3d9f42a59b22..5179d8a7934a753646363bebd724c443aefe0081 100644 (file)
--- a/src/testsuite/invite-test.e
+++ b/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"

diff --git a/src/testsuite/join-test.e b/src/testsuite/join-test.e
index 28b4c54faf210fa9746055a4c85f480a6bfce691..c088f5cc2ea13bbbdecf42b45096f3a6df77c1c9 100644 (file)
--- a/src/testsuite/join-test.e
+++ b/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"

diff --git a/src/testsuite/kick-test.e b/src/testsuite/kick-test.e
index 3d3c1ee9bd7af0fbb770ff77834ae5f3b65068c2..89da611dc27f6fcfec7b0f992eb86d916fbd0ac6 100644 (file)
--- a/src/testsuite/kick-test.e
+++ b/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"

diff --git a/src/testsuite/message-test.e b/src/testsuite/message-test.e
index 0e70640e2b6ca2abd444a19eedf34aed611d3d53..5dc325ded807cd68807c8d05dc54a31451394cf0 100644 (file)
--- a/src/testsuite/message-test.e
+++ b/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,24 +72,17 @@ 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 {

diff --git a/src/testsuite/misc-test.e b/src/testsuite/misc-test.e
index a83bc5b43a16cc36f310906bcc6c2b14e59da914..f69e7c3cfc4d8e3405e803835b6d8056e39c6385 100644 (file)
--- a/src/testsuite/misc-test.e
+++ b/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"

diff --git a/src/testsuite/mode-test.e b/src/testsuite/mode-test.e
index d6726a4385e3437cbbfbf57de5726fa3e3071388..86e4f2df67595d5ba71dc436865832149d7d6da9 100644 (file)
--- a/src/testsuite/mode-test.e
+++ b/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"

diff --git a/src/testsuite/ngircd-test1.conf b/src/testsuite/ngircd-test1.conf
index 0d0cccc9ce3b669b280cb0a26dd9f1d78df6d72e..4dec5330ecc680ecae6c44f9008a2c5546417724 100644 (file)
--- a/src/testsuite/ngircd-test1.conf
+++ b/src/testsuite/ngircd-test1.conf
@@ -17,6 +17,7 @@
        OperCanUseMode = yes
        Ident = no
        IncludeDir = /var/empty
+       DNS = no
        PAM = no
 
 [Operator]

diff --git a/src/testsuite/ngircd-test2.conf b/src/testsuite/ngircd-test2.conf
index c9d7f6c5b4b02f44144318b8e4f67cc2790e874b..0d24c4a45abf2f3f51863df0a8570968b6024c6c 100644 (file)
--- a/src/testsuite/ngircd-test2.conf
+++ b/src/testsuite/ngircd-test2.conf
@@ -17,6 +17,7 @@
        OperCanUseMode = yes
        Ident = no
        IncludeDir = /var/empty
+       DNS = no
        PAM = no
 
 [Operator]

diff --git a/src/testsuite/opless-channel-test.e b/src/testsuite/opless-channel-test.e
index 7d941720afb5689e08a1ce04175ffc5a0af66c02..4611fe17fc5f791920805bea4257a65f9914e109 100644 (file)
--- a/src/testsuite/opless-channel-test.e
+++ b/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"

diff --git a/src/testsuite/server-link-test.e b/src/testsuite/server-link-test.e
index cf3fae80099ee652d48e23b2c91b2591a3d35b65..910f8c8457ee40cf22f536a5a5496e61cbec0027 100644 (file)
--- a/src/testsuite/server-link-test.e
+++ b/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"

diff --git a/src/testsuite/stress-A.e b/src/testsuite/stress-A.e
index 256d5d1fb35cba4a04dad169e596f39cbb5c4967..d51adaa4de7803f3d7dba59a5657a666b5f18129 100644 (file)
--- a/src/testsuite/stress-A.e
+++ b/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"

diff --git a/src/testsuite/who-test.e b/src/testsuite/who-test.e
index a41e6b6a68574f394ef68731948a1ec4764f3bd0..39d50eded65897aa0bb35bcde709f443130365cf 100644 (file)
--- a/src/testsuite/who-test.e
+++ b/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"

diff --git a/src/testsuite/whois-test.e b/src/testsuite/whois-test.e
index 16b1184b9861eed4146d8ceb0597d2e02ce1dd3a..44eee6689d2ea18cf159a338dcc1b8d17a2888ec 100644 (file)
--- a/src/testsuite/whois-test.e
+++ b/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"