Commit Diff

Commit:
faf9b6ea16029d11a6b577ec98a73466e5421f55
From:
Dana Dahlstrom <dana+ngIRCd@cs.ucsd.edu>
Via:
Florian Westphal <fw@strlen.de>
Date:
Message:
Fixes to who-test: accept any ident, escape some '*' flags. This prevents who-test.e from failing when ngircd is performing ident lookups and an ident server is running.
Actions:
Patch | Tree
commit - 452fb28394361c38d32e268a0aa1a8edbccfa72c
commit + faf9b6ea16029d11a6b577ec98a73466e5421f55
blob - c54a190f843c4f7752ebaa8aff1ab937c7c8aa96
blob + aafa7956cee5ebeacc4538796d05f80559967ebe
--- src/testsuite/who-test.e
+++ src/testsuite/who-test.e
@@ -14,7 +14,7 @@ expect {
 send "who\r"
 expect {
 	timeout { exit 1 }
-	":ngircd.test.server 352 nick \* ~user localhost ngircd.test.server nick H :0 Real Name"
+	":ngircd.test.server 352 nick \* * localhost 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 ~user localhost ngircd.test.server nick H@ :0 Real Name"
+	":ngircd.test.server 352 nick #channel * localhost 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 ~user localhost ngircd.test.server nick G@ :0 Real Name"
+	":ngircd.test.server 352 nick #channel * localhost ngircd.test.server nick G@ :0 Real Name"
 }
 
 send "mode #channel +v nick\r"
@@ -50,7 +50,7 @@ expect {
 send "who localhost\r"
 expect {
 	timeout { exit 1 }
-	":ngircd.test.server 352 nick #channel ~user localhost ngircd.test.server nick G@ :0 Real Name"
+	":ngircd.test.server 352 nick #channel * localhost 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 ~user localhost ngircd.test.server nick G+ :0 Real Name"
+	":ngircd.test.server 352 nick #channel * localhost 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 \* ~user localhost ngircd.test.server nick G :0 Real Name"
+	":ngircd.test.server 352 nick \* * localhost 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 \* ~user localhost ngircd.test.server nick G* :0 Real Name"
+	":ngircd.test.server 352 nick \* * localhost ngircd.test.server nick G\* :0 Real Name"
 }
 
 send "away\r"
@@ -102,7 +102,7 @@ expect {
 send "who *cal*ho??\r"
 expect {
 	timeout { exit 1 }
-	":ngircd.test.server 352 nick \* ~user localhost ngircd.test.server nick H* :0 Real Name"
+	":ngircd.test.server 352 nick \* * localhost 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 ~user localhost ngircd.test.server nick H*@ :0 Real Name"
+	":ngircd.test.server 352 nick #opers * localhost 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 ~user localhost ngircd.test.server nick H* :0 Real Name"
+	":ngircd.test.server 352 nick #opers * localhost 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 ~user localhost ngircd.test.server nick H*+ :0 Real Name"
+	":ngircd.test.server 352 nick #opers * localhost 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 \* ~user localhost ngircd.test.server nick H* :0 Real Name"
+	":ngircd.test.server 352 nick \* * localhost ngircd.test.server nick H\* :0 Real Name"
 }
 
 send "quit\r"