1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
|
test_pkgcheck_replay: fix test_replay_pipe_stdin from sdist
Bug: https://bugs.gentoo.org/888896
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
--- a/tests/scripts/test_pkgcheck_replay.py
+++ b/tests/scripts/test_pkgcheck_replay.py
@@ -1,20 +1,18 @@
-import os
-import subprocess
import tempfile
from functools import partial
from unittest.mock import patch
import pytest
+from snakeoil.formatters import PlainTextFormatter
+
from pkgcheck import __title__ as project
from pkgcheck.checks.profiles import ProfileWarning
from pkgcheck.reporters import JsonStream
from pkgcheck.scripts import run
-from snakeoil.formatters import PlainTextFormatter
class TestPkgcheckReplay:
-
- script = partial(run, project)
+ script = staticmethod(partial(run, project))
@pytest.fixture(autouse=True)
def _setup(self, testconfig):
@@ -33,11 +31,11 @@ class TestPkgcheckReplay:
def test_replay(self, capsys):
result = ProfileWarning("profile warning: foo")
- with tempfile.NamedTemporaryFile() as f:
- out = PlainTextFormatter(f)
+ with tempfile.NamedTemporaryFile() as file:
+ out = PlainTextFormatter(file)
with JsonStream(out) as reporter:
reporter.report(result)
- with patch("sys.argv", self.args + ["-R", "StrReporter", f.name]):
+ with patch("sys.argv", self.args + ["-R", "StrReporter", file.name]):
with pytest.raises(SystemExit) as excinfo:
self.script()
out, err = capsys.readouterr()
@@ -47,13 +45,13 @@ class TestPkgcheckReplay:
def test_corrupted_resuts(self, capsys):
result = ProfileWarning("profile warning: foo")
- with tempfile.NamedTemporaryFile() as f:
- out = PlainTextFormatter(f)
+ with tempfile.NamedTemporaryFile() as file:
+ out = PlainTextFormatter(file)
with JsonStream(out) as reporter:
reporter.report(result)
- f.write(b"corrupted")
- f.seek(0)
- with patch("sys.argv", self.args + ["-R", "StrReporter", f.name]):
+ file.write(b"corrupted")
+ file.seek(0)
+ with patch("sys.argv", self.args + ["-R", "StrReporter", file.name]):
with pytest.raises(SystemExit) as excinfo:
self.script()
out, err = capsys.readouterr()
@@ -61,26 +59,28 @@ class TestPkgcheckReplay:
assert excinfo.value.code == 2
def test_invalid_file(self, capsys):
- with tempfile.NamedTemporaryFile(mode="wt") as f:
- f.write("invalid file")
- f.seek(0)
- with patch("sys.argv", self.args + ["-R", "StrReporter", f.name]):
+ with tempfile.NamedTemporaryFile(mode="wt") as file:
+ file.write("invalid file")
+ file.seek(0)
+ with patch("sys.argv", self.args + ["-R", "StrReporter", file.name]):
with pytest.raises(SystemExit) as excinfo:
self.script()
out, err = capsys.readouterr()
assert err.strip() == "pkgcheck replay: error: invalid or unsupported replay file"
assert excinfo.value.code == 2
- def test_replay_pipe_stdin(self):
- script = pytest.REPO_ROOT / "bin/pkgcheck"
- result = ProfileWarning("profile warning: foo")
- with tempfile.NamedTemporaryFile() as f:
- out = PlainTextFormatter(f)
+ def test_replay_pipe_stdin(self, capsys):
+ with tempfile.NamedTemporaryFile() as file:
+ out = PlainTextFormatter(file)
with JsonStream(out) as reporter:
- reporter.report(result)
- f.seek(0)
- p = subprocess.run(
- [script, "replay", "-R", "StrReporter", "-"], stdin=f, stdout=subprocess.PIPE
- )
- assert p.stdout.decode() == "profile warning: foo\n"
- assert p.returncode == 0
+ reporter.report(ProfileWarning("profile warning: foo"))
+ file.seek(0)
+
+ with open(file.name) as stdin, patch("sys.stdin", stdin), patch(
+ "sys.argv", [*self.args, "-R", "StrReporter", "-"]
+ ), pytest.raises(SystemExit) as excinfo:
+ self.script()
+ out, err = capsys.readouterr()
+ assert not err
+ assert out == "profile warning: foo\n"
+ assert excinfo.value.code == 0
|
