Skip to content

Commit

Permalink
Boost app startup test timeout further
Browse files Browse the repository at this point in the history
To check whether this fixes failures on the windows nightly builds
  • Loading branch information
nyalldawson committed Feb 2, 2016
1 parent bdd7ab6 commit 9e292d0
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions tests/src/python/test_qgsappstartup.py
Expand Up @@ -50,7 +50,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=90, env=None, additionalArguments=[]):
timeOut=270, env=None, additionalArguments=[]):
"""Run QGIS with the given option. Wait for testFile to be created.
If time runs out, fail.
"""
Expand Down Expand Up @@ -113,14 +113,14 @@ def testOptionsPath(self):
assert self.doTestStartup(option="--optionspath",
testDir=os.path.join(self.TMP_DIR, p),
testFile=ini,
timeOut=90), "options path %s" % p
timeOut=270), "options path %s" % p

def testConfigPath(self):
for p in ['test_config', 'test config', u'test_configé€']:
assert self.doTestStartup(option="--configpath",
testDir=os.path.join(self.TMP_DIR, p),
testFile="qgis.db",
timeOut=90), "config path %s" % p
timeOut=270), "config path %s" % p

@unittest.expectedFailure
def testPluginPath(self):
Expand All @@ -144,7 +144,7 @@ def testPluginPath(self):
option="--optionspath",
testDir=testDir,
testFile="plugin_started.txt",
timeOut=90,
timeOut=270,
loadPlugins=True,
env={'QGIS_PLUGINPATH':
str(QtCore.QString(testDir).toLocal8Bit())})
Expand All @@ -166,7 +166,7 @@ def testPyQgisStartupEnvVar(self):
msg = 'Creation of test file by executing PYQGIS_STARTUP file failed'
assert self.doTestStartup(
testFile=testfilepath,
timeOut=90,
timeOut=270,
env={'PYQGIS_STARTUP': testmod}), msg

def testOptionsAsFiles(self):
Expand All @@ -177,7 +177,7 @@ def testOptionsAsFiles(self):
assert t[0] == self.doTestStartup(option="--configpath",
testDir=os.path.join(self.TMP_DIR, 'test_optionsAsFiles'),
testFile="qgis.db",
timeOut=90,
timeOut=270,
additionalArguments=t[1]), "additional arguments: %s" % ' '.join(t[1])


Expand Down

0 comments on commit 9e292d0

Please sign in to comment.