sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-08 00:05:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Be more verbose with debug info on travis

Browse Source
This commit is contained in:
Matthias Kuhn 2015-06-16 10:14:24 +02:00
parent 2458eaf8cc
commit 3d5de9ee25
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -50,7 +50,8 @@ install:
- cd build - cd build
- cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF - cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF
-DSUPPRESS_QT_WARNINGS=ON -DENABLE_MODELTEST=ON -DENABLE_PGTEST=ON -DSUPPRESS_QT_WARNINGS=ON -DENABLE_MODELTEST=ON -DENABLE_PGTEST=ON
-DWITH_QWTPOLAR=OFF -DWITH_APIDOC=ON -DWITH_PYSPATIALITE=ON .. -DWITH_QWTPOLAR=OFF -DWITH_APIDOC=ON -DWITH_PYSPATIALITE=ON
-DCMAKE_BUILD_TYPE=RelWithDebInfo ..
before_script: before_script:
- printf "[qgis_test]\nhost=localhost\ndbname=qgis_test\nuser=postgres" > ~/.pg_service.conf - printf "[qgis_test]\nhost=localhost\ndbname=qgis_test\nuser=postgres" > ~/.pg_service.conf

2
qgis-test-travis.ctest
View File

@ -13,7 +13,7 @@ IF ($ENV{TRAVIS_PULL_REQUEST} STREQUAL "false")
ELSE() ELSE()
SET (CTEST_BUILD_NAME "PR: $ENV{TRAVIS_PULL_REQUEST} / $ENV{TRAVIS_BRANCH} ($ENV{TRAVIS_COMMIT})") SET (CTEST_BUILD_NAME "PR: $ENV{TRAVIS_PULL_REQUEST} / $ENV{TRAVIS_BRANCH} ($ENV{TRAVIS_COMMIT})")
ENDIF() ENDIF()
SET (CTEST_BUILD_CONFIGURATION "Release") SET (CTEST_BUILD_CONFIGURATION "RelWithDebInfo")
SET (INITIAL_CACHE " SET (INITIAL_CACHE "

9
tests/src/python/test_qgsappstartup.py
View File

@ -47,7 +47,7 @@ class TestPyQgsAppStartup(unittest.TestCase):
# TODO: refactor parameters to **kwargs to handle all startup combinations # TODO: refactor parameters to **kwargs to handle all startup combinations
def doTestStartup(self, option='', testDir='', testFile='', def doTestStartup(self, option='', testDir='', testFile='',
loadPlugins=False, customization=False, loadPlugins=False, customization=False,
timeOut=30, env=None): timeOut=15, env=None):
"""Run QGIS with the given option. Wait for testFile to be created. """Run QGIS with the given option. Wait for testFile to be created.
If time runs out, fail. If time runs out, fail.
""" """
@ -106,7 +106,8 @@ class TestPyQgsAppStartup(unittest.TestCase):
assert self.doTestStartup(option="--configpath", assert self.doTestStartup(option="--configpath",
testDir=os.path.join(self.TMP_DIR, p), testDir=os.path.join(self.TMP_DIR, p),
testFile="qgis.db", testFile="qgis.db",
timeOut=30), "config path %s" % p timeOut=15), "config path %s" % p
@unittest.expectedFailure @unittest.expectedFailure
def testPluginPath(self): def testPluginPath(self):
for t in ['test_plugins', 'test plugins', u'test_pluginsé€']: for t in ['test_plugins', 'test plugins', u'test_pluginsé€']:
@ -129,7 +130,7 @@ class TestPyQgsAppStartup(unittest.TestCase):
option="--optionspath", option="--optionspath",
testDir=testDir, testDir=testDir,
testFile="plugin_started.txt", testFile="plugin_started.txt",
timeOut=30, timeOut=15,
loadPlugins=True, loadPlugins=True,
env={'QGIS_PLUGINPATH': env={'QGIS_PLUGINPATH':
str(QtCore.QString(testDir).toLocal8Bit())}) str(QtCore.QString(testDir).toLocal8Bit())})
@ -151,7 +152,7 @@ class TestPyQgsAppStartup(unittest.TestCase):
msg = 'Failed to create test file from executing PYQGIS_STARTUP file' msg = 'Failed to create test file from executing PYQGIS_STARTUP file'
assert self.doTestStartup( assert self.doTestStartup(
testFile=testfilepath, testFile=testfilepath,
timeOut=30, timeOut=15,
env={'PYQGIS_STARTUP': testmod}), msg env={'PYQGIS_STARTUP': testmod}), msg