jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix quiet option for Merge (CLI) (#2695)

Browse Source
This commit is contained in:
louib
2019-02-15 08:56:29 -05:00
committed by Jonathan White
parent 8cf3ee866e
commit fa3c959212
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/TestCli.cpp
View File

@@ -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()