Skip to content
Permalink
Browse files

Be more verbose with debug info on travis

  • Loading branch information
m-kuhn committed Jun 16, 2015
1 parent 2458eaf commit 3d5de9ee2532c73010a502b13369e14a3036c896
Showing with 8 additions and 6 deletions.
  1. +2 −1 .travis.yml
  2. +1 −1 qgis-test-travis.ctest
  3. +5 −4 tests/src/python/test_qgsappstartup.py
@@ -50,7 +50,8 @@ install:
- cd build
- cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF
-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:
- printf "[qgis_test]\nhost=localhost\ndbname=qgis_test\nuser=postgres" > ~/.pg_service.conf
@@ -13,7 +13,7 @@ IF ($ENV{TRAVIS_PULL_REQUEST} STREQUAL "false")
ELSE()
SET (CTEST_BUILD_NAME "PR: $ENV{TRAVIS_PULL_REQUEST} / $ENV{TRAVIS_BRANCH} ($ENV{TRAVIS_COMMIT})")
ENDIF()
SET (CTEST_BUILD_CONFIGURATION "Release")
SET (CTEST_BUILD_CONFIGURATION "RelWithDebInfo")


SET (INITIAL_CACHE "
@@ -47,7 +47,7 @@ def tearDownClass(cls):
# TODO: refactor parameters to **kwargs to handle all startup combinations
def doTestStartup(self, option='', testDir='', testFile='',
loadPlugins=False, customization=False,
timeOut=30, env=None):
timeOut=15, env=None):
"""Run QGIS with the given option. Wait for testFile to be created.
If time runs out, fail.
"""
@@ -106,7 +106,8 @@ def testConfigPath(self):
assert self.doTestStartup(option="--configpath",
testDir=os.path.join(self.TMP_DIR, p),
testFile="qgis.db",
timeOut=30), "config path %s" % p
timeOut=15), "config path %s" % p

@unittest.expectedFailure
def testPluginPath(self):
for t in ['test_plugins', 'test plugins', u'test_pluginsé€']:
@@ -129,7 +130,7 @@ def testPluginPath(self):
option="--optionspath",
testDir=testDir,
testFile="plugin_started.txt",
timeOut=30,
timeOut=15,
loadPlugins=True,
env={'QGIS_PLUGINPATH':
str(QtCore.QString(testDir).toLocal8Bit())})
@@ -151,7 +152,7 @@ def testPyQgisStartupEnvVar(self):
msg = 'Failed to create test file from executing PYQGIS_STARTUP file'
assert self.doTestStartup(
testFile=testfilepath,
timeOut=30,
timeOut=15,
env={'PYQGIS_STARTUP': testmod}), msg


0 comments on commit 3d5de9e

Please sign in to comment.
You can’t perform that action at this time.