X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Ftestsuite%2Fchannel-test.e;h=f65c519652779a19603feea517cd9ac810ae8cef;hp=19bed8692d9b2af9292ec6cd1037042aae52358d;hb=c5da48368569383d064a2325ab3b99d10287a085;hpb=4d46eac73381ed13569e897c010bc748fad9fec4

diff --git a/src/testsuite/channel-test.e b/src/testsuite/channel-test.e
index 19bed869..f65c5196 100644
--- a/src/testsuite/channel-test.e
+++ b/src/testsuite/channel-test.e
@@ -1,6 +1,7 @@
-# $Id: channel-test.e,v 1.2 2002/09/09 21:26:00 alex Exp $
+# ngIRCd test suite
+# Channel test
 
-spawn telnet localhost 6789
+spawn telnet 127.0.0.1 6789
 expect {
 	timeout { exit 1 }
 	"Connected"
@@ -16,7 +17,7 @@ expect {
 send "join #channel\r"
 expect {
 	timeout { exit 1 }
-	":nick!~user@* JOIN :#channel"
+	"@* JOIN :#channel"
 }
 expect {
 	timeout { exit 1 }
@@ -26,13 +27,17 @@ expect {
 send "topic #channel :Test-Topic\r"
 expect {
 	timeout { exit 1 }
-	":nick!~user@* TOPIC #channel :Test-Topic"
+	"@* TOPIC #channel :Test-Topic"
 }
 
 send "who #channel\r"
 expect {
 	timeout { exit 1 }
-	"352 nick #channel ~user * nick H@ :0 User"
+	"352 nick #channel"
+}
+expect {
+	timeout { exit 1 }
+	"* nick H@ :0 User"
 }
 expect {
 	timeout { exit 1 }
@@ -59,10 +64,40 @@ expect {
 	"323 nick :End of LIST"
 }
 
-send "part #channel\r"
+send "part #channel :bye bye\r"
+expect {
+	timeout { exit 1 }
+	"@* PART #channel :bye bye"
+}
+
+send "join #channel\r"
+expect {
+	timeout { exit 1 }
+	"@* JOIN :#channel"
+}
+expect {
+	timeout { exit 1 }
+	"366"
+}
+
+send "join #channel2\r"
+expect {
+	timeout { exit 1 }
+	"@* JOIN :#channel2"
+}
+expect {
+	timeout { exit 1 }
+	"366"
+}
+
+send "join 0\r"
 expect {
 	timeout { exit 1 }
-	":nick!~user@* PART #channel :nick"
+	"@* PART #channel2 :"
+}
+expect {
+	timeout { exit 1 }
+	"@* PART #channel :"
 }
 
 send "quit\r"
@@ -70,5 +105,3 @@ expect {
 	timeout { exit 1 }
 	"Connection closed"
 }
-
-# -eof-