GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt: Fix unit test by adding initial.test dep

Browse Source 
* lang/qt/tests/t-keylist.cpp: Verify that GNUPGHOME is set.
* lang/qt/tests/initial.test: New dummy test.
* lang/qt/tests/Makefile.am: Add dependency to initial.test

--
Feels weird but this follows the pattern in tests/gpg/Makefile.am
and solves the problem that the environment is dirty.
This commit is contained in:
Andre Heinecke 2016-04-11 17:46:03 +02:00
parent afd8fad6e2
commit d9f7a18ed8
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lang/qt/tests/Makefile.am
View File

@ -22,7 +22,9 @@ GPG = gpg
TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir)
TESTS = t-keylist EXTRA_DIST = initial.test
TESTS = initial.test t-keylist
moc_files = t-keylist.moc moc_files = t-keylist.moc
@ -38,7 +40,11 @@ AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@ \
-I$(top_srcdir)/lang/cpp/src -I$(top_srcdir)/lang/qt/src \ -I$(top_srcdir)/lang/cpp/src -I$(top_srcdir)/lang/qt/src \
-DTOP_SRCDIR="$(top_srcdir)" -DTOP_SRCDIR="$(top_srcdir)"
check-local: ./t-keylist ./pubring-stamp check-local: ./pubring-stamp
# To guarantee that check-local is run before any tests we
# add this dependency:
initial.test : check-local
t_keylist_SOURCES = t-keylist.cpp t-keylist.h t_keylist_SOURCES = t-keylist.cpp t-keylist.h
@ -58,8 +64,8 @@ export GNUPGHOME := $(abs_builddir)
$(top_srcdir)/tests/gpg/secdemo.asc $(top_srcdir)/tests/gpg/secdemo.asc
$(GPG) --no-permission-warning \ $(GPG) --no-permission-warning \
--import $(top_srcdir)/tests/gpg/pubdemo.asc --import $(top_srcdir)/tests/gpg/pubdemo.asc
-$(GPG) --no-permission-warning \ $(GPG) --no-permission-warning \
--import $(top_srcdir)/tests/gpg/secdemo.asc --import $(top_srcdir)/tests/gpg/secdemo.asc
touch ./pubring-stamp touch ./pubring-stamp
.cpp.moc: .cpp.moc:

2
lang/qt/tests/initial.test Executable file
View File

@ -0,0 +1,2 @@
#!/bin/sh
exit 0

6
lang/qt/tests/t-keylist.cpp
View File

@ -23,6 +23,12 @@ private Q_SLOTS:
const QString kId = QLatin1String(keys.front().keyID()); const QString kId = QLatin1String(keys.front().keyID());
Q_ASSERT (kId == QStringLiteral("2D727CC768697734")); Q_ASSERT (kId == QStringLiteral("2D727CC768697734"));
} }
void initTestCase()
{
const QString gpgHome = qgetenv("GNUPGHOME");
QVERIFY2(!gpgHome.isEmpty(), "GNUPGHOME environment variable is not set.");
}
}; };
QTEST_MAIN(KeyListTest) QTEST_MAIN(KeyListTest)