Don't use self with self.cur_dir.
This commit is contained in:
parent
f411741389
commit
a6f8602276
@ -156,60 +156,55 @@ class GetStandardDirLinuxTests(TestCase):
|
|||||||
self.temp_dir = mkdtemp()
|
self.temp_dir = mkdtemp()
|
||||||
self.app = QCoreApplication([])
|
self.app = QCoreApplication([])
|
||||||
self.app.setApplicationName('qutebrowser')
|
self.app.setApplicationName('qutebrowser')
|
||||||
self.cur_dir = None
|
|
||||||
|
|
||||||
@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):
|
||||||
with environ_set_temp('XDG_DATA_HOME', self.temp_dir):
|
with environ_set_temp('XDG_DATA_HOME', self.temp_dir):
|
||||||
self.cur_dir = utils.get_standard_dir(QStandardPaths.DataLocation)
|
cur_dir = utils.get_standard_dir(QStandardPaths.DataLocation)
|
||||||
self.assertEqual(self.cur_dir, os.path.join(self.temp_dir,
|
self.assertEqual(cur_dir, os.path.join(self.temp_dir,
|
||||||
'qutebrowser'))
|
'qutebrowser'))
|
||||||
self.assertTrue(os.path.exists(self.cur_dir))
|
self.assertTrue(os.path.exists(cur_dir))
|
||||||
|
|
||||||
@unittest.skipUnless(sys.platform.startswith("linux"), "requires Linux")
|
@unittest.skipUnless(sys.platform.startswith("linux"), "requires Linux")
|
||||||
def test_config_explicit(self):
|
def test_config_explicit(self):
|
||||||
with environ_set_temp('XDG_CONFIG_HOME', self.temp_dir):
|
with environ_set_temp('XDG_CONFIG_HOME', self.temp_dir):
|
||||||
self.cur_dir = utils.get_standard_dir(
|
cur_dir = utils.get_standard_dir(QStandardPaths.ConfigLocation)
|
||||||
QStandardPaths.ConfigLocation)
|
self.assertEqual(cur_dir, os.path.join(self.temp_dir,
|
||||||
self.assertEqual(self.cur_dir, os.path.join(self.temp_dir,
|
|
||||||
'qutebrowser'))
|
'qutebrowser'))
|
||||||
self.assertTrue(os.path.exists(self.cur_dir))
|
self.assertTrue(os.path.exists(cur_dir))
|
||||||
|
|
||||||
@unittest.skipUnless(sys.platform.startswith("linux"), "requires Linux")
|
@unittest.skipUnless(sys.platform.startswith("linux"), "requires Linux")
|
||||||
def test_cache_explicit(self):
|
def test_cache_explicit(self):
|
||||||
with environ_set_temp('XDG_CACHE_HOME', self.temp_dir):
|
with environ_set_temp('XDG_CACHE_HOME', self.temp_dir):
|
||||||
self.cur_dir = utils.get_standard_dir(QStandardPaths.CacheLocation)
|
cur_dir = utils.get_standard_dir(QStandardPaths.CacheLocation)
|
||||||
self.assertEqual(self.cur_dir, os.path.join(self.temp_dir,
|
self.assertEqual(cur_dir, os.path.join(self.temp_dir,
|
||||||
'qutebrowser'))
|
'qutebrowser'))
|
||||||
self.assertTrue(os.path.exists(self.cur_dir))
|
self.assertTrue(os.path.exists(cur_dir))
|
||||||
|
|
||||||
@unittest.skipUnless(sys.platform.startswith("linux"), "requires Linux")
|
@unittest.skipUnless(sys.platform.startswith("linux"), "requires Linux")
|
||||||
def test_data(self):
|
def test_data(self):
|
||||||
with environ_set_temp('HOME', self.temp_dir):
|
with environ_set_temp('HOME', self.temp_dir):
|
||||||
self.cur_dir = utils.get_standard_dir(QStandardPaths.DataLocation)
|
cur_dir = utils.get_standard_dir(QStandardPaths.DataLocation)
|
||||||
self.assertEqual(self.cur_dir,
|
self.assertEqual(cur_dir, os.path.join(self.temp_dir, '.local',
|
||||||
os.path.join(self.temp_dir, '.local', 'share',
|
'share', 'qutebrowser'))
|
||||||
'qutebrowser'))
|
self.assertTrue(os.path.exists(cur_dir))
|
||||||
self.assertTrue(os.path.exists(self.cur_dir))
|
|
||||||
|
|
||||||
@unittest.skipUnless(sys.platform.startswith("linux"), "requires Linux")
|
@unittest.skipUnless(sys.platform.startswith("linux"), "requires Linux")
|
||||||
def test_config(self):
|
def test_config(self):
|
||||||
with environ_set_temp('HOME', self.temp_dir):
|
with environ_set_temp('HOME', self.temp_dir):
|
||||||
self.cur_dir = utils.get_standard_dir(
|
cur_dir = utils.get_standard_dir(
|
||||||
QStandardPaths.ConfigLocation)
|
QStandardPaths.ConfigLocation)
|
||||||
self.assertEqual(self.cur_dir,
|
self.assertEqual(cur_dir, os.path.join(self.temp_dir, '.config',
|
||||||
os.path.join(self.temp_dir, '.config',
|
|
||||||
'qutebrowser'))
|
'qutebrowser'))
|
||||||
self.assertTrue(os.path.exists(self.cur_dir))
|
self.assertTrue(os.path.exists(cur_dir))
|
||||||
|
|
||||||
@unittest.skipUnless(sys.platform.startswith("linux"), "requires Linux")
|
@unittest.skipUnless(sys.platform.startswith("linux"), "requires Linux")
|
||||||
def test_cache(self):
|
def test_cache(self):
|
||||||
with environ_set_temp('HOME', self.temp_dir):
|
with environ_set_temp('HOME', self.temp_dir):
|
||||||
self.cur_dir = utils.get_standard_dir(QStandardPaths.CacheLocation)
|
cur_dir = utils.get_standard_dir(QStandardPaths.CacheLocation)
|
||||||
self.assertEqual(self.cur_dir,
|
self.assertEqual(cur_dir, os.path.join(self.temp_dir, '.cache',
|
||||||
os.path.join(self.temp_dir, '.cache',
|
|
||||||
'qutebrowser'))
|
'qutebrowser'))
|
||||||
self.assertTrue(os.path.exists(self.cur_dir))
|
self.assertTrue(os.path.exists(cur_dir))
|
||||||
|
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
self.app.quit()
|
self.app.quit()
|
||||||
|
Loading…
Reference in New Issue
Block a user