Skip to content

Commit

Permalink
Increase timeout for PyQgsAppStartup test
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Jun 15, 2015
1 parent 00e0473 commit 9a0abc2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tests/src/python/test_qgsappstartup.py
Expand Up @@ -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=10, env=None):
timeOut=30, env=None):
"""Run QGIS with the given option. Wait for testFile to be created.
If time runs out, fail.
"""
Expand Down Expand Up @@ -129,7 +129,7 @@ def testPluginPath(self):
option="--optionspath",
testDir=testDir,
testFile="plugin_started.txt",
timeOut=10,
timeOut=30,
loadPlugins=True,
env={'QGIS_PLUGINPATH':
str(QtCore.QString(testDir).toLocal8Bit())})
Expand All @@ -151,7 +151,7 @@ def testPyQgisStartupEnvVar(self):
msg = 'Failed to create test file from executing PYQGIS_STARTUP file'
assert self.doTestStartup(
testFile=testfilepath,
timeOut=10,
timeOut=30,
env={'PYQGIS_STARTUP': testmod}), msg


Expand Down

5 comments on commit 9a0abc2

@NathanW2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to come up with a better test for this. Feels like a hack.

@NathanW2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One I idea I had was using the --code arg to run after QGIS is run and do the test in that file. Have a file to test if a plugin is loaded, or the settings are going to non default locations, etc.

@m-kuhn
Copy link
Member Author

@m-kuhn m-kuhn commented on 9a0abc2 Jun 15, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the only test that does not test the libraries, but the app startup itself and a bit of the python plugin mechanism.
Better ideas are welcome! But if it's only the timeout I don't mind increasing it.

@NathanW2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will test some ideas and see if they are better

@m-kuhn
Copy link
Member Author

@m-kuhn m-kuhn commented on 9a0abc2 Jun 15, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to hear!

Please sign in to comment.