diff options
author | Andre Heinecke <[email protected]> | 2016-08-25 14:23:58 +0000 |
---|---|---|
committer | Andre Heinecke <[email protected]> | 2016-08-25 14:23:58 +0000 |
commit | c875f07e559a7c53fc173b4c3f9f5715f3fbb8f8 (patch) | |
tree | be8cfe5110f0c604c9a3db0f0ddc3b1125863a2c | |
parent | qt: Add generic flag support for keylistjobs (diff) | |
download | gpgme-c875f07e559a7c53fc173b4c3f9f5715f3fbb8f8.tar.gz gpgme-c875f07e559a7c53fc173b4c3f9f5715f3fbb8f8.zip |
qt: Fix keyring copy in tests
* lang/qt/test/t-encrypt.cpp,
lang/qt/test/t-tofuinfo.cpp: Assert on copy failure.
* lang/qt/test/t-support.cpp (copyKeyrings): Fix path.
-rw-r--r-- | lang/qt/tests/t-encrypt.cpp | 2 | ||||
-rw-r--r-- | lang/qt/tests/t-support.cpp | 2 | ||||
-rw-r--r-- | lang/qt/tests/t-tofuinfo.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lang/qt/tests/t-encrypt.cpp b/lang/qt/tests/t-encrypt.cpp index 44cea969..3d4cfa92 100644 --- a/lang/qt/tests/t-encrypt.cpp +++ b/lang/qt/tests/t-encrypt.cpp @@ -242,7 +242,7 @@ public Q_SLOT: Q_ASSERT(agentConf.open(QIODevice::WriteOnly)); agentConf.write("allow-loopback-pinentry"); agentConf.close(); - copyKeyrings(gpgHome, mDir.path()); + Q_ASSERT(copyKeyrings(gpgHome, mDir.path())); } private: diff --git a/lang/qt/tests/t-support.cpp b/lang/qt/tests/t-support.cpp index 73e8d5c2..27c01321 100644 --- a/lang/qt/tests/t-support.cpp +++ b/lang/qt/tests/t-support.cpp @@ -50,7 +50,7 @@ bool QGpgMETest::copyKeyrings(const QString &src, const QString &dest) bool is21dir = QFileInfo(src + QDir::separator() + QStringLiteral("pubring.kbx")).exists(); const QString name = is21dir ? QStringLiteral("pubring.kbx") : QStringLiteral("pubring.gpg"); - if (!QFile::copy(src + name, dest + QDir::separator() + name)) { + if (!QFile::copy(src + QDir::separator() + name, dest + QDir::separator() + name)) { return false; } if (!is21dir) { diff --git a/lang/qt/tests/t-tofuinfo.cpp b/lang/qt/tests/t-tofuinfo.cpp index 7eea1eae..d3061676 100644 --- a/lang/qt/tests/t-tofuinfo.cpp +++ b/lang/qt/tests/t-tofuinfo.cpp @@ -239,7 +239,7 @@ private Q_SLOTS: Q_ASSERT(agentConf.open(QIODevice::WriteOnly)); agentConf.write("allow-loopback-pinentry"); agentConf.close(); - copyKeyrings(gpgHome, mDir.path()); + Q_ASSERT(copyKeyrings(gpgHome, mDir.path())); } private: QTemporaryDir mDir; |