[auth] Skip unit tests if qca-ossl plugin is missing

qgis · Sep 26, 2015 · dd9b37b · dd9b37b
1 parent 05a28b8
commit dd9b37b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/tests/src/core/testqgsauthconfig.cpp b/tests/src/core/testqgsauthconfig.cpp
@@ -19,6 +19,7 @@
 #include <QStringList>
 
 #include "qgsapplication.h"
+#include "qgsauthcrypto.h"
 #include "qgsauthconfig.h"
 
 /** \ingroup UnitTests
@@ -50,6 +51,8 @@ void TestQgsAuthConfig::initTestCase()
 {
   QgsApplication::init();
   QgsApplication::initQgis();
+  if ( QgsAuthCrypto::isDisabled() )
+    QSKIP( "QCA's qca-ossl plugin is missing, skipping test case", SkipAll );
 }
 
 void TestQgsAuthConfig::cleanupTestCase()

diff --git a/tests/src/core/testqgsauthcrypto.cpp b/tests/src/core/testqgsauthcrypto.cpp
@@ -82,7 +82,8 @@ void TestQgsAuthCrypto::initTestCase()
 {
   QgsApplication::init();
   QgsApplication::initQgis();
-  QVERIFY2( !QgsAuthCrypto::isDisabled(), "QCA's qca-ossl plugin is missing, skipping test" );
+  if ( QgsAuthCrypto::isDisabled() )
+    QSKIP( "QCA's qca-ossl plugin is missing, skipping test case", SkipAll );
 }
 
 void TestQgsAuthCrypto::cleanupTestCase()