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

Fix intents

Browse Source
This commit is contained in:
Lamar Pavel 2015-05-28 13:05:12 +02:00
parent b5eea81e2e
commit f5d299d8c7
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qutebrowser/config/configtypes.py
View File

@ -820,12 +820,12 @@ class File(BaseType):
value = os.path.expanduser(value)
try:
if not os.path.isabs(value):
if standarddir.config():
if os.path.isfile(
os.path.join(standarddir.config(), value)):
return
cfgdir = standarddir.config()
if cfgdir:
if os.path.isfile(os.path.join(cfgdir, value)):
return
raise configexc.ValidationError(value,
"must be an absolute path!")
"must be an absolute path!")
if not os.path.isfile(value):
raise configexc.ValidationError(value, "must be a valid file!")
except UnicodeEncodeError as e:

14
tests/config/test_configtypes.py
View File

@ -30,7 +30,7 @@ from PyQt5.QtGui import QColor, QFont
from PyQt5.QtNetwork import QNetworkProxy
from qutebrowser.config import configtypes, configexc
from qutebrowser.utils import debug, utils, standarddir
from qutebrowser.utils import debug, utils
class Font(QFont):
@ -1375,19 +1375,19 @@ class TestFile:
def test_validate_exists_rel(self, os_path, monkeypatch):
"""Test validate with a relative path to an existing file."""
monkeypatch.setattr('qutebrowser.config.configtypes.standarddir.config',
lambda: '/home/foo/.config/')
monkeypatch.setattr(
'qutebrowser.config.configtypes.standarddir.config',
lambda: '/home/foo/.config/')
os_path.expanduser.side_effect = lambda x: x
os_path.isfile.return_value = True
os_path.isabs.return_value = False
self.t.validate('foobar')
os_path.join.assert_called_once_with('/home/foo/.config/',
'foobar')
os_path.join.assert_called_once_with('/home/foo/.config/', 'foobar')
def test_validate_rel_config_none(self, os_path, monkeypatch):
"""Test with a relative path and standarddir.config returning None."""
monkeypatch.setattr('qutebrowser.config.configtypes.standarddir.config',
lambda: None)
monkeypatch.setattr(
'qutebrowser.config.configtypes.standarddir.config', lambda: None)
os_path.isabs.return_value = False
with pytest.raises(configexc.ValidationError):
self.t.validate('foobar')