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

Move extended-join test to integration test

Browse Source 
Fix build of modperl/modpython
This commit is contained in:
Alexey Sokolov
2024-01-14 01:46:12 +00:00
parent e2508d9716
commit 4b1a524a72
8 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/modperl/functions.in
+2
View File
@@ -63,6 +63,8 @@ EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic)
bool OnServerCapAvailable(const CString& sCap)
bool OnServerCap302Available(const CString& sCap, const CString& sValue)
void OnServerCapResult(const CString& sCap, bool bSuccess)
void OnClientAttached()
void OnClientDetached()
EModRet OnTimerAutoJoin(CChan& Channel)
bool OnEmbeddedWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl)
EModRet OnAddNetwork(CIRCNetwork& Network, CString& sErrorRet)
modules/modperl/module.h
+2
View File
@@ -118,6 +118,8 @@ class ZNC_EXPORT_LIB_EXPORT CPerlModule : public CModule {
bool OnServerCapAvailable(const CString& sCap) override;
bool OnServerCap302Available(const CString& sCap, const CString& sValue) override;
void OnServerCapResult(const CString& sCap, bool bSuccess) override;
void OnClientAttached() override;
void OnClientDetached() override;
EModRet OnTimerAutoJoin(CChan& Channel) override;
bool OnEmbeddedWebRequest(CWebSock&, const CString&, CTemplate&) override;
EModRet OnAddNetwork(CIRCNetwork& Network, CString& sErrorRet) override;
modules/modperl/startup.pl
+2
View File
@@ -406,6 +406,8 @@ sub OnChanNotice {}
sub OnTopic {}
sub OnServerCapAvailable {}
sub OnServerCap302Available { my ($self, $cap, $value) = @_; $self->OnServerCapAvailable($cap) }
sub OnClientAttached {}
sub OnClientDetached {}
sub OnServerCapResult {}
sub OnTimerAutoJoin {}
sub OnEmbeddedWebRequest {}
modules/modpython/functions.in
+2
View File
@@ -63,6 +63,8 @@ EModRet OnTopic(CNick& Nick, CChan& Channel, CString& sTopic)
bool OnServerCapAvailable(const CString& sCap)
bool OnServerCap302Available(const CString& sCap, const CString& sValue)
void OnServerCapResult(const CString& sCap, bool bSuccess)
void OnClientAttached()
void OnClientDetached()
EModRet OnTimerAutoJoin(CChan& Channel)
bool OnEmbeddedWebRequest(CWebSock& WebSock, const CString& sPageName, CTemplate& Tmpl)
EModRet OnAddNetwork(CIRCNetwork& Network, CString& sErrorRet)
modules/modpython/module.h
+2
View File
@@ -138,6 +138,8 @@ class ZNC_EXPORT_LIB_EXPORT CPyModule : public CModule {
bool OnServerCapAvailable(const CString& sCap) override;
bool OnServerCap302Available(const CString& sCap, const CString& sValue) override;
void OnServerCapResult(const CString& sCap, bool bSuccess) override;
void OnClientAttached() override;
void OnClientDetached() override;
EModRet OnTimerAutoJoin(CChan& Channel) override;
bool OnEmbeddedWebRequest(CWebSock&, const CString&, CTemplate&) override;
EModRet OnAddNetwork(CIRCNetwork& Network, CString& sErrorRet) override;
modules/modpython/znc.py
+6
View File
@@ -413,6 +413,12 @@ class Module:
def OnServerCap302Available(self, sCap, sValue):
return self.OnServerCapAvailable(sCap)
def OnClientAttached(self):
pass
def OnClientDetached(self):
pass
def OnServerCapResult(self, sCap, bSuccess):
pass
test/ClientTest.cpp
-16
View File
@@ -172,22 +172,6 @@ TEST_F(ClientTest, UserhostInNames) { // aka UHNAMES
ElementsAre(msg.ToString(), extmsg.ToString()));
}
TEST_F(ClientTest, ExtendedJoin) {
m_pTestSock->ReadLine(":server CAP * ACK :extended-join");
m_pTestClient->Reset();
CMessage msg(":nick!user@host JOIN #channel");
CMessage extmsg(":nick!user@host JOIN #channel account :Real Name");
EXPECT_FALSE(m_pTestClient->HasExtendedJoin());
m_pTestClient->PutClient(extmsg);
EXPECT_THAT(m_pTestClient->vsLines, ElementsAre(msg.ToString()));
m_pTestClient->SetExtendedJoin(true);
EXPECT_TRUE(m_pTestClient->HasExtendedJoin());
m_pTestClient->PutClient(extmsg);
EXPECT_THAT(m_pTestClient->vsLines,
ElementsAre(msg.ToString(), extmsg.ToString()));
}
TEST_F(ClientTest, StatusMsg) {
m_pTestSock->ReadLine(
":irc.znc.in 001 me :Welcome to the Internet Relay Network me");
test/integration/tests/core.cpp
+20
View File
@@ -271,6 +271,26 @@ TEST_F(ZNCTest, AwayNotify) {
client.Write("znc shutdown");
}
TEST_F(ZNCTest, ExtendedJoin) {
auto znc = Run();
auto ircd = ConnectIRCd();
auto client = LoginClient();
ircd.Write(":server 001 user :welcome");
client.ReadUntil(" 001 ");
ircd.Write(":nick!user@host JOIN #channel account :Real Name");
// Not sure why it is like this when server sends such format unexpectedly.
client.ReadUntil("JOIN #channel account :Real Name");
ircd.Write("CAP nick ACK extended-join");
ircd.Write(":nick!user@host JOIN #channel2 account :Real Name");
QByteArray line;
client.ReadUntilAndGet("JOIN", line);
EXPECT_EQ(line.toStdString(), "JOIN #channel2");
client.Write("CAP REQ extended-join");
client.ReadUntil("CAP user ACK :extended-join");
ircd.Write(":nick!user@host JOIN #channel3 account :Real Name");
client.ReadUntil("JOIN #channel3 account :Real Name");
}
TEST_F(ZNCTest, CAP302LSWaitFull) {
auto znc = Run();
auto ircd = ConnectIRCd();