From 053e6e0a7b8ea38ad9d4160c84814867bbb9fcf6 Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Thu, 25 Aug 2016 15:20:02 +0200 Subject: 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. --- lang/qt/tests/t-encrypt.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'lang/qt/tests/t-encrypt.cpp') diff --git a/lang/qt/tests/t-encrypt.cpp b/lang/qt/tests/t-encrypt.cpp index 708c2050..44cea969 100644 --- a/lang/qt/tests/t-encrypt.cpp +++ b/lang/qt/tests/t-encrypt.cpp @@ -242,11 +242,7 @@ public Q_SLOT: 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: -- cgit v1.2.3