Merge commit 'aad49bd260494878aed6795c7a897ad1d28c3082'

2 files changed, 17 insertions, 14 deletions

diff --git a/src/testsuite/.gitignore b/src/testsuite/.gitignore
index a4c1e629..ce2760fa 100644
--- a/src/testsuite/.gitignore
+++ b/src/testsuite/.gitignore
@@ -1,6 +1,9 @@
 T-ngircd
 channel-test
 connect-test
+invite-test
+join-test
+kick-test
 misc-test
 mode-test
 opless-channel-test
diff --git a/src/testsuite/who-test.e b/src/testsuite/who-test.e
index 2e148447..54c19922 100644
--- a/src/testsuite/who-test.e
+++ b/src/testsuite/who-test.e
@@ -14,7 +14,7 @@ expect {
 send "who\r"
 expect {
 	timeout { exit 1 }
-	":ngircd.test.server 352 nick \* * localhost ngircd.test.server nick H :0 Real Name"
+	":ngircd.test.server 352 nick \* * ngircd.test.server nick H :0 Real Name"
 }
 
 send "join #channel\r"
@@ -26,7 +26,7 @@ expect {
 send "who 0\r"
 expect {
 	timeout { exit 1 }
-	":ngircd.test.server 352 nick #channel * localhost ngircd.test.server nick H@ :0 Real Name"
+	":ngircd.test.server 352 nick #channel * ngircd.test.server nick H@ :0 Real Name"
 }
 
 send "away :testing\r"
@@ -38,7 +38,7 @@ expect {
 send "who *\r"
 expect {
 	timeout { exit 1 }
-	":ngircd.test.server 352 nick #channel * localhost ngircd.test.server nick G@ :0 Real Name"
+	":ngircd.test.server 352 nick #channel * ngircd.test.server nick G@ :0 Real Name"
 }
 
 send "mode #channel +v nick\r"
@@ -47,10 +47,10 @@ expect {
 	"@* MODE #channel +v nick\r"
 }
 
-send "who localhost\r"
+send "who localhos*\r"
 expect {
 	timeout { exit 1 }
-	":ngircd.test.server 352 nick #channel * localhost ngircd.test.server nick G@ :0 Real Name"
+	":ngircd.test.server 352 nick #channel * ngircd.test.server nick G@ :0 Real Name"
 }
 
 send "mode #channel -o nick\r"
@@ -62,7 +62,7 @@ expect {
 send "who ngircd.test.server\r"
 expect {
 	timeout { exit 1 }
-	":ngircd.test.server 352 nick #channel * localhost ngircd.test.server nick G+ :0 Real Name"
+	":ngircd.test.server 352 nick #channel * ngircd.test.server nick G+ :0 Real Name"
 }
 
 send "part #channel\r"
@@ -74,7 +74,7 @@ expect {
 send "who Real?Name\r"
 expect {
 	timeout { exit 1 }
-	":ngircd.test.server 352 nick \* * localhost ngircd.test.server nick G :0 Real Name"
+	":ngircd.test.server 352 nick \* * ngircd.test.server nick G :0 Real Name"
 }
 
 send "oper TestOp 123\r"
@@ -90,7 +90,7 @@ expect {
 send "who 0 o\r"
 expect {
 	timeout { exit 1 }
-	":ngircd.test.server 352 nick \* * localhost ngircd.test.server nick G\* :0 Real Name"
+	":ngircd.test.server 352 nick \* * ngircd.test.server nick G* :0 Real Name"
 }
 
 send "away\r"
@@ -99,10 +99,10 @@ expect {
 	"305 nick"
 }
 
-send "who *cal*ho??\r"
+send "who ??cal*ho*\r"
 expect {
 	timeout { exit 1 }
-	":ngircd.test.server 352 nick \* * localhost ngircd.test.server nick H\* :0 Real Name"
+	":ngircd.test.server 352 nick \* * ngircd.test.server nick H* :0 Real Name"
 }
 
 send "join #opers\r"
@@ -114,7 +114,7 @@ expect {
 send "who #opers\r"
 expect {
 	timeout { exit 1 }
-	":ngircd.test.server 352 nick #opers * localhost ngircd.test.server nick H\*@ :0 Real Name"
+	":ngircd.test.server 352 nick #opers * ngircd.test.server nick H*@ :0 Real Name"
 }
 
 send "mode #opers -o nick\r"
@@ -126,7 +126,7 @@ expect {
 send "who *.server\r"
 expect {
 	timeout { exit 1 }
-	":ngircd.test.server 352 nick #opers * localhost ngircd.test.server nick H\* :0 Real Name"
+	":ngircd.test.server 352 nick #opers * ngircd.test.server nick H* :0 Real Name"
 }
 
 send "mode #opers +v nick\r"
@@ -138,7 +138,7 @@ expect {
 send "who Real*me\r"
 expect {
 	timeout { exit 1 }
-	":ngircd.test.server 352 nick #opers * localhost ngircd.test.server nick H\*+ :0 Real Name"
+	":ngircd.test.server 352 nick #opers * ngircd.test.server nick H*+ :0 Real Name"
 }
 
 send "mode #opers +s\r"
@@ -150,7 +150,7 @@ expect {
 send "who n?c?\r"
 expect {
 	timeout { exit 1 }
-	":ngircd.test.server 352 nick \* * localhost ngircd.test.server nick H\* :0 Real Name"
+	":ngircd.test.server 352 nick \* * ngircd.test.server nick H* :0 Real Name"
 }
 expect {
 	timeout { exit 1 }