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

Improve file validating in test_hints

Browse Source
This commit is contained in:
Florian Bruhin 2016-08-18 23:20:20 +02:00
parent 1eb0eabdab
commit 322a4323cb
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/end2end/test_hints_html.py
View File

@ -39,6 +39,14 @@ def collect_tests():
ParsedFile = collections.namedtuple('ParsedFile', ['target'])
class InvalidFile(Exception):
def __init__(self, test_name, msg):
super().__init__("Invalid comment found in {}, please read "
"tests/end2end/data/hints/html/README.md - {}".format(
test_name, msg))
def _parse_file(test_name):
"""Parse the given HTML file."""
file_path = os.path.join(os.path.abspath(os.path.dirname(__file__)),
@ -49,22 +57,21 @@ def _parse_file(test_name):
comment = soup.find(text=lambda text: isinstance(text, bs4.Comment))
if comment is None:
pytest.fail("No comment found in {}, please read "
"tests/end2end/data/hints/html/README.md".format(
test_name))
raise InvalidFile(test_name, "no comment found")
data = yaml.load(comment)
if not isinstance(data, dict):
pytest.fail("Invalid comment found in {}, please read "
"tests/end2end/data/hints/html/README.md - "
"expected yaml dict but got {}".format(
test_name, type(data).__name__))
raise InvalidFile(test_name, "expected yaml dict but got {}".format(
type(data).__name__))
if set(data.keys()) != {'target'}:
pytest.fail("Invalid comment found in {}, please read "
"tests/end2end/data/hints/html/README.md - "
"expected key 'target' but found {}".format(
test_name, ', '.join(set(data.keys()))))
allowed_keys = {'target'}
if not set(data.keys()).issubset(allowed_keys):
raise InvalidFile(test_name, "expected keys {} but found {}".format(
', '.join(allowed_keys),
', '.join(set(data.keys()))))
if not 'target' in data:
raise InvalidFile(test_name, "'target' key not found")
return ParsedFile(target=data['target'])