Merge pull request #1 from louib/feature/js-cli-import-fix-tests

Fix import tests.
keepassxreboot · Oct 2, 2019 · bdddab9 · bdddab9
2 parents cb15280 + a842617
commit bdddab9
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 5 deletions.
diff --git a/src/cli/Create.h b/src/cli/Create.h
@@ -21,7 +21,6 @@
 #include "Command.h"
 
 #include "keys/FileKey.h"
-#include "keys/PasswordKey.h"
 
 class Create : public Command
 {

diff --git a/src/cli/Import.h b/src/cli/Import.h
@@ -20,8 +20,6 @@
 
 #include "Command.h"
 
-#include "keys/PasswordKey.h"
-
 class Import : public Command
 {
 public:

diff --git a/tests/TestCli.cpp b/tests/TestCli.cpp
@@ -1033,8 +1033,6 @@ void TestCli::testImport()
     QString errorMessage = QString("File " + databaseFilename + " already exists.\n");
     QCOMPARE(m_stderrFile->readAll(), errorMessage.toUtf8());
 
-    m_stdoutFile->reset();
-
     // Quiet option
     QScopedPointer<QTemporaryDir> testDirQuiet(new QTemporaryDir());
     QString databaseFilenameQuiet = testDirQuiet->path() + "testImport2.kdbx";
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,8 +20,6 @@ @@
     #include "Command.h"
-    #include "keys/PasswordKey.h"
     class Import : public Command
     {
     public:
@@ Expand Down @@