Don't use self with self.cur_dir.

This commit is contained in:
Florian Bruhin 2014-05-09 09:15:00 +02:00
parent f411741389
commit a6f8602276

View File

@ -156,60 +156,55 @@ class GetStandardDirLinuxTests(TestCase):
self.temp_dir = mkdtemp()
self.app = QCoreApplication([])
self.app.setApplicationName('qutebrowser')
self.cur_dir = None
@unittest.skipUnless(sys.platform.startswith("linux"), "requires Linux")
def test_data_explicit(self):
with environ_set_temp('XDG_DATA_HOME', self.temp_dir):
self.cur_dir = utils.get_standard_dir(QStandardPaths.DataLocation)
self.assertEqual(self.cur_dir, os.path.join(self.temp_dir,
'qutebrowser'))
self.assertTrue(os.path.exists(self.cur_dir))
cur_dir = utils.get_standard_dir(QStandardPaths.DataLocation)
self.assertEqual(cur_dir, os.path.join(self.temp_dir,
'qutebrowser'))
self.assertTrue(os.path.exists(cur_dir))
@unittest.skipUnless(sys.platform.startswith("linux"), "requires Linux")
def test_config_explicit(self):
with environ_set_temp('XDG_CONFIG_HOME', self.temp_dir):
self.cur_dir = utils.get_standard_dir(
QStandardPaths.ConfigLocation)
self.assertEqual(self.cur_dir, os.path.join(self.temp_dir,
'qutebrowser'))
self.assertTrue(os.path.exists(self.cur_dir))
cur_dir = utils.get_standard_dir(QStandardPaths.ConfigLocation)
self.assertEqual(cur_dir, os.path.join(self.temp_dir,
'qutebrowser'))
self.assertTrue(os.path.exists(cur_dir))
@unittest.skipUnless(sys.platform.startswith("linux"), "requires Linux")
def test_cache_explicit(self):
with environ_set_temp('XDG_CACHE_HOME', self.temp_dir):
self.cur_dir = utils.get_standard_dir(QStandardPaths.CacheLocation)
self.assertEqual(self.cur_dir, os.path.join(self.temp_dir,
'qutebrowser'))
self.assertTrue(os.path.exists(self.cur_dir))
cur_dir = utils.get_standard_dir(QStandardPaths.CacheLocation)
self.assertEqual(cur_dir, os.path.join(self.temp_dir,
'qutebrowser'))
self.assertTrue(os.path.exists(cur_dir))
@unittest.skipUnless(sys.platform.startswith("linux"), "requires Linux")
def test_data(self):
with environ_set_temp('HOME', self.temp_dir):
self.cur_dir = utils.get_standard_dir(QStandardPaths.DataLocation)
self.assertEqual(self.cur_dir,
os.path.join(self.temp_dir, '.local', 'share',
'qutebrowser'))
self.assertTrue(os.path.exists(self.cur_dir))
cur_dir = utils.get_standard_dir(QStandardPaths.DataLocation)
self.assertEqual(cur_dir, os.path.join(self.temp_dir, '.local',
'share', 'qutebrowser'))
self.assertTrue(os.path.exists(cur_dir))
@unittest.skipUnless(sys.platform.startswith("linux"), "requires Linux")
def test_config(self):
with environ_set_temp('HOME', self.temp_dir):
self.cur_dir = utils.get_standard_dir(
cur_dir = utils.get_standard_dir(
QStandardPaths.ConfigLocation)
self.assertEqual(self.cur_dir,
os.path.join(self.temp_dir, '.config',
'qutebrowser'))
self.assertTrue(os.path.exists(self.cur_dir))
self.assertEqual(cur_dir, os.path.join(self.temp_dir, '.config',
'qutebrowser'))
self.assertTrue(os.path.exists(cur_dir))
@unittest.skipUnless(sys.platform.startswith("linux"), "requires Linux")
def test_cache(self):
with environ_set_temp('HOME', self.temp_dir):
self.cur_dir = utils.get_standard_dir(QStandardPaths.CacheLocation)
self.assertEqual(self.cur_dir,
os.path.join(self.temp_dir, '.cache',
'qutebrowser'))
self.assertTrue(os.path.exists(self.cur_dir))
cur_dir = utils.get_standard_dir(QStandardPaths.CacheLocation)
self.assertEqual(cur_dir, os.path.join(self.temp_dir, '.cache',
'qutebrowser'))
self.assertTrue(os.path.exists(cur_dir))
def tearDown(self):
self.app.quit()