Merge branch '1.7.x'

2026-08-10 02:43:05 +02:00 · 2019-04-19 12:15:14 +01:00
parent 8d309bbb3d 964747e6b4
commit 0370efe830
4 changed files with 16 additions and 15 deletions
@@ -217,6 +217,7 @@ TEST_F(ZNCTest, BuildMod) {
                      proc->setProcessChannelMode(QProcess::ForwardedChannels);
                  });
        p.ShouldFinishItself(1);
+        p.ShouldFinishInSec(300);
    }
    {
        Process p(ZNC_BIN_DIR "/znc-buildmod",
@@ -226,6 +227,7 @@ TEST_F(ZNCTest, BuildMod) {
                      proc->setProcessChannelMode(QProcess::ForwardedChannels);
                  });
        p.ShouldFinishItself();
+        p.ShouldFinishInSec(300);
    }
    client.Write("znc loadmod testmod");
    client.Write("PRIVMSG *testmod :hi");