diff options
author | louib <L0U13@protonmail.com> | 2019-02-15 16:56:29 +0300 |
---|---|---|
committer | Jonathan White <support@dmapps.us> | 2019-02-15 16:56:29 +0300 |
commit | fa3c95921217159201c1713bd38721f01cfff938 (patch) | |
tree | ecb29f3f6a3f8f9710988ba5b4baaaf96a21c2a1 /tests/TestCli.cpp | |
parent | 8cf3ee866e6dd5eced2f9a3a2310dc4925bcbd6e (diff) |
Fix quiet option for Merge (CLI) (#2695)
Diffstat (limited to 'tests/TestCli.cpp')
-rw-r--r-- | tests/TestCli.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/TestCli.cpp b/tests/TestCli.cpp index 244ccc18d..e2e66c2a4 100644 --- a/tests/TestCli.cpp +++ b/tests/TestCli.cpp @@ -883,6 +883,14 @@ void TestCli::testMerge() mergeCmd.execute({"merge", "-q", "-s", sourceFile.fileName(), sourceFile.fileName()}); m_stdoutFile->seek(pos); QCOMPARE(m_stdoutFile->readAll(), QByteArray("")); + + // Quiet option without the -s option + pos = m_stdoutFile->pos(); + Utils::Test::setNextPassword("a"); + Utils::Test::setNextPassword("a"); + mergeCmd.execute({"merge", "-q", sourceFile.fileName(), sourceFile.fileName()}); + m_stdoutFile->seek(pos); + QCOMPARE(m_stdoutFile->readAll(), QByteArray("")); } void TestCli::testRemove() |