tjh.dev
1diff --git a/graphviz/backend.py b/graphviz/backend.py
2index d2c4b97..f7175cd 100644
3--- a/graphviz/backend.py
4+++ b/graphviz/backend.py
5@@ -122,7 +122,7 @@ def command(engine, format_, filepath=None, renderer=None, formatter=None):
6 raise ValueError('unknown formatter: %r' % formatter)
7
8 output_format = [f for f in (format_, renderer, formatter) if f is not None]
9- cmd = ['dot', '-K%s' % engine, '-T%s' % ':'.join(output_format)]
10+ cmd = ['@graphviz@/bin/dot', '-K%s' % engine, '-T%s' % ':'.join(output_format)]
11
12 if filepath is None:
13 rendered = None
14@@ -275,7 +275,7 @@ def unflatten(source,
15 if fanout and stagger is None:
16 raise RequiredArgumentError('fanout given without stagger')
17
18- cmd = ['unflatten']
19+ cmd = ['@graphviz@/bin/unflatten']
20 if stagger is not None:
21 cmd += ['-l', str(stagger)]
22 if fanout:
23@@ -304,7 +304,7 @@ def version():
24 Graphviz Release version entry format
25 https://gitlab.com/graphviz/graphviz/-/blob/f94e91ba819cef51a4b9dcb2d76153684d06a913/gen_version.py#L17-20
26 """
27- cmd = ['dot', '-V']
28+ cmd = ['@graphviz@/bin/dot', '-V']
29 out, _ = run(cmd, check=True, encoding='ascii',
30 stdout=subprocess.PIPE,
31 stderr=subprocess.STDOUT)
32diff --git a/tests/test_backend.py b/tests/test_backend.py
33index d10ef1a..e4aba58 100644
34--- a/tests/test_backend.py
35+++ b/tests/test_backend.py
36@@ -52,7 +52,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'):
37 m.decode.assert_called_once_with(encoding)
38
39
40-@pytest.exe
41+@pytest.mark.skip(reason='empty $PATH has no effect')
42 @pytest.mark.usefixtures('empty_path')
43 @pytest.mark.parametrize('func, args', [
44 (render, ['dot', 'pdf', 'nonfilepath']),
45@@ -146,7 +146,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): # noqa: N803
46
47 assert render('dot', 'pdf', 'nonfilepath', quiet=quiet) == 'nonfilepath.pdf'
48
49- Popen.assert_called_once_with(['dot', '-Kdot', '-Tpdf', '-O', 'nonfilepath'],
50+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpdf', '-O', 'nonfilepath'],
51 stdout=subprocess.PIPE,
52 stderr=subprocess.PIPE,
53 cwd=None, startupinfo=mocker.ANY)
54@@ -208,7 +208,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803
55 assert e.value.stdout is mocker.sentinel.out
56 e.value.stdout = mocker.sentinel.new_stdout
57 assert e.value.stdout is mocker.sentinel.new_stdout
58- Popen.assert_called_once_with(['dot', '-Kdot', '-Tpng'],
59+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpng'],
60 stdin=subprocess.PIPE,
61 stdout=subprocess.PIPE,
62 stderr=subprocess.PIPE,
63@@ -231,7 +231,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803
64
65 assert pipe('dot', 'png', b'nongraph', quiet=quiet) is mocker.sentinel.out
66
67- Popen.assert_called_once_with(['dot', '-Kdot', '-Tpng'],
68+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Kdot', '-Tpng'],
69 stdin=subprocess.PIPE,
70 stdout=subprocess.PIPE,
71 stderr=subprocess.PIPE,
72@@ -259,7 +259,7 @@ def test_unflatten_mocked(capsys, mocker, Popen):
73 proc.communicate.return_value = (b'nonresult', b'')
74
75 assert unflatten('nonsource') == 'nonresult'
76- Popen.assert_called_once_with(['unflatten'],
77+ Popen.assert_called_once_with(['@graphviz@/bin/unflatten'],
78 stdin=subprocess.PIPE,
79 stdout=subprocess.PIPE,
80 stderr=subprocess.PIPE,
81@@ -290,7 +290,7 @@ def test_version_parsefail_mocked(mocker, Popen): # noqa: N803
82 with pytest.raises(RuntimeError, match=r'nonversioninfo'):
83 version()
84
85- Popen.assert_called_once_with(['dot', '-V'],
86+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-V'],
87 stdout=subprocess.PIPE,
88 stderr=subprocess.STDOUT,
89 startupinfo=mocker.ANY)
90@@ -312,7 +312,7 @@ def test_version_mocked(mocker, Popen, stdout, expected): # noqa: N803
91
92 assert version() == expected
93
94- Popen.assert_called_once_with(['dot', '-V'],
95+ Popen.assert_called_once_with(['@graphviz@/bin/dot', '-V'],
96 stdout=subprocess.PIPE,
97 stderr=subprocess.STDOUT,
98 startupinfo=mocker.ANY)