diff options
| author | Andre Heinecke <[email protected]> | 2016-08-25 13:20:02 +0000 |
|---|---|---|
| committer | Andre Heinecke <[email protected]> | 2016-08-25 13:20:02 +0000 |
| commit | 053e6e0a7b8ea38ad9d4160c84814867bbb9fcf6 (patch) | |
| tree | 5c291fffeed07e80ac7ae42d396975e159ed2be5 /lang/qt/tests/t-tofuinfo.cpp | |
| parent | qt: Remove unused variable in test (diff) | |
| download | gpgme-053e6e0a7b8ea38ad9d4160c84814867bbb9fcf6.tar.gz gpgme-053e6e0a7b8ea38ad9d4160c84814867bbb9fcf6.zip | |
qt: Fix tofuinfo test when gpg is gpg2
* lang/qt/tests/t-support.cpp (QGpgMETest::copyKeyrings): New helper.
* lang/qt/tests/t-support.h: Declare.
* lang/qt/tests/t-encrypt.cpp: use it
* lang/qt/tests/t-tofuinbo.cpp: ditto.
--
New helper takes care of copying the correct files for either
keybox or keyring.
Diffstat (limited to 'lang/qt/tests/t-tofuinfo.cpp')
| -rw-r--r-- | lang/qt/tests/t-tofuinfo.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lang/qt/tests/t-tofuinfo.cpp b/lang/qt/tests/t-tofuinfo.cpp index ab466eed..7eea1eae 100644 --- a/lang/qt/tests/t-tofuinfo.cpp +++ b/lang/qt/tests/t-tofuinfo.cpp @@ -239,11 +239,7 @@ private Q_SLOTS: Q_ASSERT(agentConf.open(QIODevice::WriteOnly)); agentConf.write("allow-loopback-pinentry"); agentConf.close(); - Q_ASSERT(QFile::copy(gpgHome + QStringLiteral("/pubring.gpg"), - mDir.path() + QStringLiteral("/pubring.gpg"))); - Q_ASSERT(QFile::copy(gpgHome + QStringLiteral("/secring.gpg"), - mDir.path() + QStringLiteral("/secring.gpg"))); - + copyKeyrings(gpgHome, mDir.path()); } private: QTemporaryDir mDir; |