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

Update integration test after change in webadmin

Browse Source
This commit is contained in:
Alexey Sokolov
2016-02-24 23:01:39 +00:00
parent def29fe3f7
commit 9b31a077a5
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/integration/main.cpp
+18 -16
View File
@@ -62,7 +62,7 @@ class IO {
: m_device(device), m_verbose(verbose) {}
virtual ~IO() {}
void ReadUntil(QByteArray pattern) {
auto deadline = QDateTime::currentDateTime().addSecs(30);
auto deadline = QDateTime::currentDateTime().addSecs(60);
while (true) {
int search = m_readed.indexOf(pattern);
if (search != -1) {
@@ -403,20 +403,21 @@ TEST_F(ZNCTest, FixCVE20149403) {
"Basic " + QByteArray("user:hunter2").toBase64());
request.setUrl(QUrl("http://127.0.0.1:12345/mods/global/webadmin/addchan"));
HttpPost(request, {
{"user", "user"},
{"network", "test"},
{"submitted", "1"},
{"name", "znc"},
{"user", "user"},
{"network", "test"},
{"submitted", "1"},
{"name", "znc"},
{"enabled", "1"},
});
ircd.ReadUntil("JOIN #znc");
Z;
EXPECT_THAT(HttpPost(request,
{
{"user", "user"},
{"network", "test"},
{"submitted", "1"},
{"name", "znc"},
})
EXPECT_THAT(HttpPost(request, {
{"user", "user"},
{"network", "test"},
{"submitted", "1"},
{"name", "znc"},
{"enabled", "1"},
})
->readAll()
.toStdString(),
HasSubstr("Channel [#znc] already exists"));
@@ -441,10 +442,11 @@ TEST_F(ZNCTest, FixFixOfCVE20149403) {
"Basic " + QByteArray("user:hunter2").toBase64());
request.setUrl(QUrl("http://127.0.0.1:12345/mods/global/webadmin/addchan"));
auto reply = HttpPost(request, {
{"user", "user"},
{"network", "test"},
{"submitted", "1"},
{"name", "@#znc"},
{"user", "user"},
{"network", "test"},
{"submitted", "1"},
{"name", "@#znc"},
{"enabled", "1"},
});
EXPECT_THAT(reply->readAll().toStdString(),
HasSubstr("Could not add channel [@#znc]"));