mirror of
https://github.com/znc/znc.git
synced 2026-08-06 17:03:14 +02:00
Apply fixes for IsParting() pull request.
This commit is contained in:
@@ -1204,7 +1204,6 @@ bool CIRCSock::OnPartMessage(CPartMessage& Message) {
|
||||
}
|
||||
|
||||
if (Nick.NickEquals(GetNick())) {
|
||||
if (pChan) pChan->SetParting(false);
|
||||
m_pNetwork->DelChan(sChan);
|
||||
}
|
||||
|
||||
|
||||
@@ -574,9 +574,6 @@ TEST_F(IRCSockTest, PartingFlag) {
|
||||
CMessage serverPart(":me PART #chan");
|
||||
m_pTestSock->ReadLine(serverPart.ToString());
|
||||
|
||||
// IsParting() should be free
|
||||
EXPECT_FALSE(m_pTestChan->IsParting());
|
||||
|
||||
// Verify channel was deleted
|
||||
EXPECT_EQ(m_pTestNetwork->FindChan("#chan"), nullptr);
|
||||
}
|
||||
@@ -593,7 +590,7 @@ TEST_F(IRCSockTest, PartingFlagOnError) {
|
||||
CMessage errorMsg(":server 442 me #chan :You're not on that channel");
|
||||
m_pTestSock->ReadLine(errorMsg.ToString());
|
||||
|
||||
// IsParting() should be free
|
||||
// IsParting() should be cleared
|
||||
EXPECT_FALSE(m_pTestChan->IsParting());
|
||||
|
||||
// Verify channel was deleted
|
||||
|
||||
@@ -1368,9 +1368,7 @@ TEST_F(ZNCTest, PartWithError403) {
|
||||
client.ReadUntil(":nick JOIN :#test");
|
||||
client.Write("PART #test");
|
||||
|
||||
QByteArray partMsg;
|
||||
ircd.ReadUntilAndGet("PART", partMsg);
|
||||
EXPECT_THAT(partMsg.toStdString(), HasSubstr("PART #test"));
|
||||
ircd.ReadUntil("PART #test");
|
||||
|
||||
// Server returns 403 error (ERR_NOSUCHCHANNEL) instead of confirming
|
||||
ircd.Write(":server 403 nick #test :No such channel");
|
||||
|
||||
Reference in New Issue
Block a user