From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3066515800D for ; Sat, 31 Dec 2022 11:31:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F480E0874; Sat, 31 Dec 2022 11:31:48 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5A721E0874 for ; Sat, 31 Dec 2022 11:31:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7AA6D340B9E for ; Sat, 31 Dec 2022 11:31:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D6E4D7D0 for ; Sat, 31 Dec 2022 11:31:45 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1672486283.c219e33c3cb40dceb5b3796e00dbd25b3c9dcf8a.arthurzam@gentoo> Subject: [gentoo-commits] proj/pkgcore/pkgcheck:master commit in: bin/, tests/scripts/ X-VCS-Repository: proj/pkgcore/pkgcheck X-VCS-Files: bin/pkgcheck tests/scripts/test_pkgcheck_replay.py X-VCS-Directories: tests/scripts/ bin/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: c219e33c3cb40dceb5b3796e00dbd25b3c9dcf8a X-VCS-Branch: master Date: Sat, 31 Dec 2022 11:31:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3e6f9011-223b-4d41-8b25-af7ed3fcef76 X-Archives-Hash: 0cfeda6b49ff9ae555eb8809be20c3fb commit: c219e33c3cb40dceb5b3796e00dbd25b3c9dcf8a Author: Arthur Zamarin gentoo org> AuthorDate: Sat Dec 31 11:19:02 2022 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Sat Dec 31 11:31:23 2022 +0000 URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=c219e33c test_pkgcheck_replay: fix test_replay_pipe_stdin from sdist We don't ship `bin/` in the sdist, so we are unable to run the script `bin/pkgcheck` from the sdist. Instead, use monkey-patching and `tool` to run with stdin `pkgcheck replay`. Bug: https://bugs.gentoo.org/888896 Signed-off-by: Arthur Zamarin gentoo.org> bin/pkgcheck | 1 - tests/scripts/test_pkgcheck_replay.py | 58 +++++++++++++++++------------------ 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/bin/pkgcheck b/bin/pkgcheck deleted file mode 120000 index 78f990ec..00000000 --- a/bin/pkgcheck +++ /dev/null @@ -1 +0,0 @@ -../src/pkgcheck/scripts/__init__.py \ No newline at end of file diff --git a/tests/scripts/test_pkgcheck_replay.py b/tests/scripts/test_pkgcheck_replay.py index c2aeda66..b6b7d606 100644 --- 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