From 0cc7ae0ff465ffe27c2481af0e14a1b2e7121d67 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sun, 27 Mar 2016 16:55:38 +0200 Subject: [PATCH] Inlcude PyQgsAppStartup test on Qt5 --- ci/travis/linux/qt5/blacklist.txt | 1 - tests/src/python/test_qgsappstartup.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/travis/linux/qt5/blacklist.txt b/ci/travis/linux/qt5/blacklist.txt index 496bbe394a1c..4107f4a6a6fb 100755 --- a/ci/travis/linux/qt5/blacklist.txt +++ b/ci/travis/linux/qt5/blacklist.txt @@ -2,7 +2,6 @@ ProcessingGdalAlgorithmsTest ProcessingParametersTest ProcessingQgisAlgorithmsTest PyQgsAnalysis -PyQgsAppStartup PyQgsApplication PyQgsAtlasComposition PyQgsAttributeTableModel diff --git a/tests/src/python/test_qgsappstartup.py b/tests/src/python/test_qgsappstartup.py index 9e0ac16b64b9..ffd445efa465 100644 --- a/tests/src/python/test_qgsappstartup.py +++ b/tests/src/python/test_qgsappstartup.py @@ -167,12 +167,12 @@ def testOptionsAsFiles(self): testDir=os.path.join(self.TMP_DIR, 'test_optionsAsFiles'), testFile="qgis.db", timeOut=270, - additionalArguments=['--help']), "additional arguments: %s" % ' '.join(t[1]) + additionalArguments=['--help']) self.doTestStartup(option="--configpath", testDir=os.path.join(self.TMP_DIR, 'test_optionsAsFiles'), testFile="qgis.db", timeOut=270, - additionalArguments=['--'], ['--help']), "additional arguments: %s" % ' '.join(t[1]) + additionalArguments=['--', '--help']) if __name__ == '__main__':