Skip to content
Permalink
Browse files

Fix failing tests

  • Loading branch information
m-kuhn committed Mar 14, 2016
1 parent 9852d6d commit 054894a3dc31055adf8e5679b852803a025dc1b1
@@ -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
@@ -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)
@@ -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
@@ -24,6 +24,7 @@
__revision__ = '$Format:%H$'

import os
import qgis

from PyQt4.QtCore import QSize
from PyQt4.QtGui import QPainter, QColor
@@ -14,6 +14,8 @@

import os

import qgis

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

@@ -24,6 +24,7 @@
__revision__ = '$Format:%H$'

import os
import qgis

from PyQt.QtCore import QSize

0 comments on commit 054894a

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