rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: Get rid of second QCoreApplication.

Browse Source
This commit is contained in:
Florian Bruhin 2015-02-20 09:21:59 +01:00
parent 684f0d3df5
commit f33bc7bf31
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qutebrowser/test/__init__.py
View File

@ -24,3 +24,4 @@ from PyQt5.QtWidgets import QApplication
# We create a singleton QApplication here. # We create a singleton QApplication here.
qApp = QApplication([]) qApp = QApplication([])
qApp.setApplicationName('qutebrowser')

21
qutebrowser/test/utils/test_standarddir.py
View File

@ -26,10 +26,10 @@ import shutil
import unittest import unittest
import tempfile import tempfile
from PyQt5.QtCore import QStandardPaths, QCoreApplication from PyQt5.QtCore import QStandardPaths
from qutebrowser.utils import standarddir from qutebrowser.utils import standarddir
from qutebrowser.test import helpers from qutebrowser.test import helpers, qApp
class GetStandardDirLinuxTests(unittest.TestCase): class GetStandardDirLinuxTests(unittest.TestCase):
@ -38,13 +38,13 @@ class GetStandardDirLinuxTests(unittest.TestCase):
Attributes: Attributes:
temp_dir: A temporary directory. temp_dir: A temporary directory.
app: The QCoreApplication used. old_name: The old applicationName.
""" """
def setUp(self): def setUp(self):
self.temp_dir = tempfile.mkdtemp() self.temp_dir = tempfile.mkdtemp()
self.app = QCoreApplication([]) self.old_name = qApp.applicationName()
self.app.setApplicationName('qutebrowser') qApp.setApplicationName('qutebrowser')
@unittest.skipUnless(sys.platform.startswith("linux"), "requires Linux") @unittest.skipUnless(sys.platform.startswith("linux"), "requires Linux")
def test_data_explicit(self): def test_data_explicit(self):
@ -99,7 +99,7 @@ class GetStandardDirLinuxTests(unittest.TestCase):
'qutebrowser')) 'qutebrowser'))
def tearDown(self): def tearDown(self):
self.app.quit() qApp.setApplicationName(self.old_name)
shutil.rmtree(self.temp_dir) shutil.rmtree(self.temp_dir)
@ -108,13 +108,16 @@ class GetStandardDirWindowsTests(unittest.TestCase):
"""Tests for standarddir.get under Windows. """Tests for standarddir.get under Windows.
Attributes: Attributes:
app: The QCoreApplication used. old_name: The old applicationName.
""" """
def setUp(self): def setUp(self):
self.app = QCoreApplication([]) self.old_name = qApp.applicationName()
# We can't store the files in a temp dir, so we don't chose qutebrowser # We can't store the files in a temp dir, so we don't chose qutebrowser
self.app.setApplicationName('qutebrowser_test') qApp.setApplicationName('qutebrowser_test')
def tearDown(self):
qApp.setApplicationName(self.old_name)
@unittest.skipUnless(sys.platform.startswith("win"), "requires Windows") @unittest.skipUnless(sys.platform.startswith("win"), "requires Windows")
def test_data(self): def test_data(self):