X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftestsuite%2Fmode-test.e;h=86e4f2df67595d5ba71dc436865832149d7d6da9;hb=refs%2Fheads%2FTestsuiteNoDNS;hp=fe1d7e5802c898e770e06b93e9533eea4cc31877;hpb=1dd953b0c09fe3d1d159c867d074e327b45272ef;p=ngircd-alex.git

diff --git a/src/testsuite/mode-test.e b/src/testsuite/mode-test.e
index fe1d7e58..86e4f2df 100644
--- a/src/testsuite/mode-test.e
+++ b/src/testsuite/mode-test.e
@@ -1,6 +1,7 @@
-# $Id: mode-test.e,v 1.3 2002/11/22 23:45:51 alex Exp $
+# ngIRCd test suite
+# MODE test
 
-spawn telnet localhost 6789
+spawn telnet 127.0.0.1 6789
 expect {
 	timeout { exit 1 }
 	"Connected"
@@ -16,7 +17,7 @@ expect {
 send "mode nick +i\r"
 expect {
 	timeout { exit 1 }
-	":nick!~user@* MODE nick +i"
+	"@* MODE nick :+i"
 }
 
 send "mode nick\r"
@@ -28,7 +29,47 @@ expect {
 send "mode nick -i\r"
 expect {
 	timeout { exit 1 }
-	":nick!~user@* MODE nick -i"
+	"@* MODE nick :-i"
+}
+
+send "join #usermode\r"
+expect {
+	timeout { exit 1 }
+	"@* JOIN :#usermode"
+}
+expect {
+	timeout { exit 1 }
+	"366"
+}
+
+send "mode #usermode +v nick\r"
+expect {
+	timeout { exit 1 }
+	"@* MODE #usermode +v nick\r"
+}
+
+send "mode #usermode +h nick\r"
+expect {
+	timeout { exit 1 }
+	"@* MODE #usermode +h nick\r"
+}
+
+send "mode #usermode +a nick\r"
+expect {
+	timeout { exit 1 }
+	"482 nick"
+}
+
+send "mode #usermode +q nick\r"
+expect {
+	timeout { exit 1 }
+	"482 nick"
+}
+
+send "mode #usermode -vho nick nick nick\r"
+expect {
+	timeout { exit 1 }
+	"@* MODE #usermode -vho nick nick nick"
 }
 
 send "oper TestOp 123\r"
@@ -47,10 +88,38 @@ expect {
 	"221 nick +o"
 }
 
+send "mode #usermode +a nick\r"
+expect {
+	timeout { exit 1 }
+	"@* MODE #usermode +a nick"
+}
+
+send "mode #usermode +q nick\r"
+expect {
+	timeout { exit 1 }
+	"@* MODE #usermode +q nick"
+}
+
+send "names #usermode\r"
+expect {
+	timeout { exit 1 }
+	"353 nick = #usermode :~nick"
+}
+expect {
+	timeout { exit 1 }
+	"366 nick #usermode"
+}
+
+send "part #usermode\r"
+expect {
+	timeout { exit 1 }
+	"@* PART #usermode"
+}
+
 send "join #channel\r"
 expect {
 	timeout { exit 1 }
-	":nick!~user@* JOIN :#channel"
+	"@* JOIN :#channel"
 }
 expect {
 	timeout { exit 1 }
@@ -60,7 +129,7 @@ expect {
 send "mode #channel +tn\r"
 expect {
 	timeout { exit 1 }
-	":nick!~user@* MODE #channel +tn"
+	"@* MODE #channel +tn"
 }
 
 send "mode #channel\r"
@@ -72,31 +141,31 @@ expect {
 send "mode #channel +v nick\r"
 expect {
 	timeout { exit 1 }
-	":nick!~user@* MODE #channel +v nick"
+	"@* MODE #channel +v nick\r"
 }
 
 send "mode #channel +I nick1\r"
 expect {
 	timeout { exit 1 }
-	":nick!~user@* MODE #channel +I nick1!*@*"
+	"@* MODE #channel +I nick1!*@*"
 }
 
 send "mode #channel +b nick2@domain\r"
 expect {
 	timeout { exit 1 }
-	":nick!~user@* MODE #channel +b nick2!*@domain"
+	"@* MODE #channel +b nick2!*@domain"
 }
 
 send "mode #channel +I nick3!user\r"
 expect {
 	timeout { exit 1 }
-	":nick!~user@* MODE #channel +I nick3!user@*"
+	"@* MODE #channel +I nick3!user@*"
 }
 
-send "mode #channel -vo nick\r"
+send "mode #channel -vo nick nick\r"
 expect {
 	timeout { exit 1 }
-	":nick!~user@* MODE #channel -vo nick"
+	"@* MODE #channel -vo nick nick\r"
 }
 
 send "quit\r"
@@ -104,5 +173,3 @@ expect {
 	timeout { exit 1 }
 	"Connection closed"
 }
-
-# -eof-