@@ -47,7 +47,7 @@ def tearDownClass(cls):
47
47
# TODO: refactor parameters to **kwargs to handle all startup combinations
48
48
def doTestStartup (self , option = '' , testDir = '' , testFile = '' ,
49
49
loadPlugins = False , customization = False ,
50
- timeOut = 30 , env = None ):
50
+ timeOut = 15 , env = None ):
51
51
"""Run QGIS with the given option. Wait for testFile to be created.
52
52
If time runs out, fail.
53
53
"""
@@ -106,7 +106,8 @@ def testConfigPath(self):
106
106
assert self .doTestStartup (option = "--configpath" ,
107
107
testDir = os .path .join (self .TMP_DIR , p ),
108
108
testFile = "qgis.db" ,
109
- timeOut = 30 ), "config path %s" % p
109
+ timeOut = 15 ), "config path %s" % p
110
+
110
111
@unittest .expectedFailure
111
112
def testPluginPath (self ):
112
113
for t in ['test_plugins' , 'test plugins' , u'test_pluginsé€' ]:
@@ -129,7 +130,7 @@ def testPluginPath(self):
129
130
option = "--optionspath" ,
130
131
testDir = testDir ,
131
132
testFile = "plugin_started.txt" ,
132
- timeOut = 30 ,
133
+ timeOut = 15 ,
133
134
loadPlugins = True ,
134
135
env = {'QGIS_PLUGINPATH' :
135
136
str (QtCore .QString (testDir ).toLocal8Bit ())})
@@ -151,7 +152,7 @@ def testPyQgisStartupEnvVar(self):
151
152
msg = 'Failed to create test file from executing PYQGIS_STARTUP file'
152
153
assert self .doTestStartup (
153
154
testFile = testfilepath ,
154
- timeOut = 30 ,
155
+ timeOut = 15 ,
155
156
env = {'PYQGIS_STARTUP' : testmod }), msg
156
157
157
158
0 commit comments