Skip to content

Commit

Permalink
make message match more specific
Browse files Browse the repository at this point in the history
  • Loading branch information
xflr6 committed May 13, 2024
1 parent 9c00e8a commit 047569f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tests/backend/test_piping.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, sentinel, mock_run, quiet):
reason='https://gitlab.com/graphviz/graphviz/-/issues/1269'))])
def test_pipe(capsys, engine, format_, renderer, formatter, pattern,
data=b'graph { spam }'):
with pytest.deprecated_call(match=r'3 positional args'):
with pytest.deprecated_call(match=r'\b3 positional args\b'):
out = graphviz.pipe(engine, format_, data,
renderer, formatter).decode('ascii')

Expand Down
4 changes: 2 additions & 2 deletions tests/backend/test_rendering.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def test_render_missing_file(quiet, engine='dot', format_='pdf'):
ids=lambda x: getattr(x, '__name__', x))
def test_render_unknown_parameter_raises(args, expected_exception, match,
supported_number=3):
checker = (pytest.deprecated_call(match=rf'{supported_number:d} positional args')
checker = (pytest.deprecated_call(match=rf'\b{supported_number:d} positional args\b')
if len(args) > supported_number
else contextlib.nullcontext())
with pytest.raises(expected_exception, match=match), checker:
Expand All @@ -60,7 +60,7 @@ def test_render(capsys, tmp_path, engine, format_, renderer, formatter,
assert lpath.write_bytes(data) == len(data) == lpath.stat().st_size
rendered = lpath.with_suffix(f'{lpath.suffix}.{expected_suffix}')

with pytest.deprecated_call(match=r'3 positional args'):
with pytest.deprecated_call(match=r'\b3 positional args\b'):
result = graphviz.render(engine, format_, str(lpath),
renderer, formatter)

Expand Down
2 changes: 1 addition & 1 deletion tests/test_all_classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def test_save_mocked(mocker, dot, filename='nonfilename', directory='nondirector
mock_makedirs = mocker.patch('os.makedirs', autospec=True)
mock_open = mocker.patch('builtins.open', mocker.mock_open())

with pytest.deprecated_call(match=r'2 positional args\b'):
with pytest.deprecated_call(match=r'\b2 positional args\b'):
assert dot.save(filename, directory) == dot.filepath

assert dot.filename == filename
Expand Down
2 changes: 1 addition & 1 deletion tests/test_sources.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def test_filepath(platform, source):

def test_from_file(tmp_path, filename='hello.gv', directory='source_hello',
data='digraph { hello -> world }', encoding='utf-8',
deprecation_match=r'2 positional args\b'):
deprecation_match=r'\b2 positional args\b'):
lpath = tmp_path / directory
lpath.mkdir()
(lpath / filename).write_text(data, encoding=encoding)
Expand Down

0 comments on commit 047569f

Please sign in to comment.