Skip to content
Permalink
Browse files

fix PyQgsAppStartup on windows

  • Loading branch information
jef-n committed Jan 12, 2016
1 parent 917ea5c commit 0ba089e6d43bdbb52e945d985287f2b28a941282
Showing with 5 additions and 5 deletions.
  1. +5 −5 tests/src/python/test_qgsappstartup.py
@@ -139,20 +139,20 @@ def testPyQgisStartupEnvVar(self):
# verify PYQGIS_STARTUP env variable file is run by embedded interpreter
# create a temp python module that writes out test file
testfile = 'pyqgis_startup.txt'
testfilepath = os.path.join(self.TMP_DIR, testfile)
testfilepath = os.path.join(self.TMP_DIR, testfile).replace('\\', '/')
testcode = [
"f = open('{0}', 'w')\n".format(testfilepath.replace('\\', '\\\\')),
"f = open('{0}', 'w')\n".format(testfilepath),
"f.write('This is a test')\n",
"f.close()\n"
]
testmod = os.path.join(self.TMP_DIR, 'pyqgis_startup.py')
testmod = os.path.join(self.TMP_DIR, 'pyqgis_startup.py').replace('\\', '/')
f = open(testmod, 'w')
f.writelines(testcode)
f.close()
msg = 'Failed to create test file from executing PYQGIS_STARTUP file'
msg = 'Creation of test file by executing PYQGIS_STARTUP file failed'
assert self.doTestStartup(
testFile=testfilepath,
timeOut=15,
timeOut=120,
env={'PYQGIS_STARTUP': testmod}), msg


3 comments on commit 0ba089e

@nyalldawson

This comment has been minimized.

Copy link
Collaborator

@nyalldawson nyalldawson replied Jan 23, 2016

@jef-n Can I revert this? It hasn't fixed the test on the nightly Windows builds (see http://dash.orfeo-toolbox.org/testDetails.php?test=36669232&build=215399), and seems to have broken the test under the debian nightlies (http://dash.orfeo-toolbox.org/testDetails.php?test=36656832&build=215373)

@jef-n

This comment has been minimized.

Copy link
Member Author

@jef-n jef-n replied Jan 23, 2016

@nyalldawson not so sure that it's this commit, it essentially just raises the timeout. I suspect that it's the cloudflare transition that causes this. Let's see if 764c649 helps.

@jef-n

This comment has been minimized.

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