adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-10 19:02:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Progress: CAP NEW is sent to client

Browse Source
This commit is contained in:
Alexey Sokolov
2024-01-07 10:53:51 +00:00
parent 2605370fd1
commit 7ee389278f
1 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/integration/tests/core.cpp
+34 -19
View File
@@ -572,7 +572,16 @@ TEST_F(ZNCTest, ServerDependentCapInModule) {
}
bool OnServerCap302Available(const CString& sCap, const CString& sValue) override {
PutModule("OnServerCapAvailable " + sCap + " " + sValue);
return sCap == "testcap";
if (sCap == "testcap") {
if (GetNetwork()->IsServerCapAccepted("testcap")) {
// This can happen when server sent CAP NEW with another value.
for (CClient* pClient : GetNetwork()->GetClients()) {
pClient->NotifyServerDependentCap("testcap", true, sValue, nullptr);
}
}
return true;
}
return false;
}
void OnServerCapResult(const CString& sCap, bool bSuccess) override {
if (sCap == "testcap") {
@@ -604,6 +613,7 @@ TEST_F(ZNCTest, ServerDependentCapInModule) {
)");
client.Write("znc loadmod testmod");
client.ReadUntil("Loaded module testmod");
client.Write("znc addnetwork net2");
client.Close();
client = ConnectClient();
@@ -622,27 +632,32 @@ TEST_F(ZNCTest, ServerDependentCapInModule) {
client.Write("CAP REQ testcap");
client.ReadUntil("CAP nick ACK :testcap");
client.Write("CAP LS");
client.ReadUntil(" testcap=value ");
client.Write("CAP LS");
client.ReadUntil(" testcap=value ");
ircd.Write("CAP nick DEL testcap");
client.ReadUntil("CAP nick DEL :testcap");
client.ReadUntil(":OnServerCapResult testcap false false");
ircd.Write("CAP nick DEL testcap");
client.ReadUntil("CAP nick DEL :testcap");
client.ReadUntil(":OnServerCapResult testcap false false");
ircd.Close();
ircd = ConnectIRCd();
ircd.ReadUntil("CAP LS 302");
ircd.Write("CAP nick LS :testcap=new");
ircd.ReadUntil("CAP REQ :testcap");
ircd.Close();
ircd = ConnectIRCd();
ircd.ReadUntil("CAP LS 302");
ircd.Write("CAP nick LS :testcap=new");
ircd.ReadUntil("CAP REQ :testcap");
ircd.Write("CAP nick ACK :testcap");
ircd.ReadUntil("CAP END");
// TODO should NEW wait until 001?
// TODO combine multiple NEWs to single line
client.ReadUntil("CAP nick NEW :testcap=new");
ircd.ReadUntil("001 nick Welcome");
client.ReadUntil("Welcome2");
// TODO NEW with new value without DEL
// TODO client.Write("jumpnetwork");
ircd.ReadUntil("CAP END");
// TODO should NEW wait until 001?
// TODO combine multiple NEWs to single line
client.ReadUntil("CAP nick NEW :testcap=new");
ircd.Write("001 nick Welcome");
client.ReadUntil("Welcome");
// NEW with new value without DEL
ircd.Write("CAP nick NEW testcap=another");
client.ReadUntil("CAP nick NEW :testcap=another");
client.Write("znc jumpnetwork net2");
client.ReadUntil("AAAAA");
}
TEST_F(ZNCTest, HashUpgrade) {