From b60b789717d035cf6247428916a3a1a4de526781 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sun, 6 Feb 2022 18:35:50 -0500 Subject: [PATCH] test: nicer way to test debug=pybehave --- tests/test_cmdline.py | 7 ++++--- tests/test_debug.py | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py index 462cecee3..5299a7add 100644 --- a/tests/test_cmdline.py +++ b/tests/test_cmdline.py @@ -3,6 +3,7 @@ """Test cmdline.py for coverage.py.""" +import ast import pprint import re import sys @@ -20,7 +21,7 @@ from coverage.version import __url__ from tests.coveragetest import CoverageTest, OK, ERR, command_line -from tests.helpers import os_sep +from tests.helpers import os_sep, re_line class BaseCmdLineTest(CoverageTest): @@ -298,8 +299,8 @@ def test_debug_pybehave(self): assert " CPYTHON:" in out assert " PYVERSION:" in out assert " pep626:" in out - pyversion = next(l for l in out.splitlines() if " PYVERSION:" in l) - vtuple = eval(pyversion.partition(":")[-1]) # pylint: disable=eval-used + pyversion = re_line(r" PYVERSION:", out) + vtuple = ast.literal_eval(pyversion.partition(":")[-1].strip()) assert vtuple[:5] == sys.version_info def test_debug_premain(self): diff --git a/tests/test_debug.py b/tests/test_debug.py index bade588ec..b4ce6d925 100644 --- a/tests/test_debug.py +++ b/tests/test_debug.py @@ -3,6 +3,7 @@ """Tests of coverage/debug.py""" +import ast import io import os import re @@ -202,8 +203,8 @@ def test_debug_pybehave(self): out_text = self.f1_debug_output(["pybehave"]) out_lines = out_text.splitlines() assert 10 < len(out_lines) < 40 - pyversion = next(l for l in out_lines if " PYVERSION:" in l) - vtuple = eval(pyversion.partition(":")[-1]) # pylint: disable=eval-used + pyversion = re_line(r" PYVERSION:", out_text) + vtuple = ast.literal_eval(pyversion.partition(":")[-1].strip()) assert vtuple[:5] == sys.version_info