Skip to content

Commit 082a27e

Browse files
committed
compat: move running_on_ci() to compat
Currently defined in `_pytest.assertion.util`, but then imported from `_pytest.terminal`, so makes sense to move it to the general utils place.
1 parent 57e38cc commit 082a27e

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

src/_pytest/assertion/truncate.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from __future__ import annotations
88

9-
from _pytest.assertion import util
9+
from _pytest.compat import running_on_ci
1010
from _pytest.config import Config
1111
from _pytest.nodes import Item
1212

@@ -43,7 +43,7 @@ def _get_truncation_parameters(item: Item) -> tuple[bool, int, int]:
4343

4444
verbose = item.config.get_verbosity(Config.VERBOSITY_ASSERTIONS)
4545

46-
should_truncate = verbose < 2 and not util.running_on_ci()
46+
should_truncate = verbose < 2 and not running_on_ci()
4747
should_truncate = should_truncate and (max_lines > 0 or max_chars > 0)
4848

4949
return should_truncate, max_lines, max_chars

src/_pytest/assertion/util.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from collections.abc import Mapping
1010
from collections.abc import Sequence
1111
from collections.abc import Set as AbstractSet
12-
import os
1312
import pprint
1413
from typing import Any
1514
from typing import Literal
@@ -21,6 +20,7 @@
2120
from _pytest._io.pprint import PrettyPrinter
2221
from _pytest._io.saferepr import saferepr
2322
from _pytest._io.saferepr import saferepr_unlimited
23+
from _pytest.compat import running_on_ci
2424
from _pytest.config import Config
2525

2626

@@ -613,9 +613,3 @@ def _notin_text(term: str, text: str, verbose: int = 0) -> list[str]:
613613
else:
614614
newdiff.append(line)
615615
return newdiff
616-
617-
618-
def running_on_ci() -> bool:
619-
"""Check if we're currently running on a CI system."""
620-
env_vars = ["CI", "BUILD_NUMBER"]
621-
return any(var in os.environ for var in env_vars)

src/_pytest/compat.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,3 +304,9 @@ def __bool__(self) -> bool:
304304

305305
def __call__(self) -> bool:
306306
return self._value
307+
308+
309+
def running_on_ci() -> bool:
310+
"""Check if we're currently running on a CI system."""
311+
env_vars = ["CI", "BUILD_NUMBER"]
312+
return any(var in os.environ for var in env_vars)

src/_pytest/terminal.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from _pytest._io import TerminalWriter
4040
from _pytest._io.wcwidth import wcswidth
4141
import _pytest._version
42-
from _pytest.assertion.util import running_on_ci
42+
from _pytest.compat import running_on_ci
4343
from _pytest.config import _PluggyPlugin
4444
from _pytest.config import Config
4545
from _pytest.config import ExitCode

testing/test_collection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import tempfile
1111
import textwrap
1212

13-
from _pytest.assertion.util import running_on_ci
13+
from _pytest.compat import running_on_ci
1414
from _pytest.config import ExitCode
1515
from _pytest.fixtures import FixtureRequest
1616
from _pytest.main import _in_venv

0 commit comments

Comments
 (0)