Skip to content

Commit

Permalink
Fix failing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Mar 14, 2016
1 parent 9852d6d commit 054894a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
7 changes: 2 additions & 5 deletions tests/src/python/test_qgsappstartup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,11 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

from PyQt4 import QtCore
import sys
import os
import glob
import re
import time
# import locale
import shutil
import subprocess
import tempfile
Expand Down Expand Up @@ -59,7 +57,7 @@ def doTestStartup(self, option='', testDir='', testFile='',

# from unicode to local
if testDir:
testDir = str(QtCore.QString(testDir).toLocal8Bit())
testDir = testDir.encode('ascii', 'ignore')
if not os.path.exists(testDir):
os.mkdir(testDir)
myTestFile = os.path.join(testDir, testFile)
Expand Down Expand Up @@ -146,8 +144,7 @@ def testPluginPath(self):
testFile="plugin_started.txt",
timeOut=270,
loadPlugins=True,
env={'QGIS_PLUGINPATH':
str(QtCore.QString(testDir).toLocal8Bit())})
env={'QGIS_PLUGINPATH': testDir.encode('ascii', 'ignore')})

def testPyQgisStartupEnvVar(self):
# verify PYQGIS_STARTUP env variable file is run by embedded interpreter
Expand Down
1 change: 1 addition & 0 deletions tests/src/python/test_qgsblendmodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
__revision__ = '$Format:%H$'

import os
import qgis

from PyQt4.QtCore import QSize
from PyQt4.QtGui import QPainter, QColor
Expand Down
2 changes: 2 additions & 0 deletions tests/src/python/test_qgscomposition.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

import os

import qgis

from PyQt4.QtCore import QFileInfo, QDir
from PyQt4.QtXml import QDomDocument

Expand Down
1 change: 1 addition & 0 deletions tests/src/python/test_qgsgeometrygeneratorsymbollayerv2.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
__revision__ = '$Format:%H$'

import os
import qgis

from PyQt.QtCore import QSize

Expand Down

0 comments on commit 054894a

Please sign in to comment.