mirror of
https://github.com/nix-community/nix-direnv.git
synced 2024-09-11 11:35:54 +03:00
test: other random ruff lints
This commit is contained in:
parent
8c46f6e97d
commit
d5a10dc6d5
@ -1,9 +1,9 @@
|
||||
import shutil
|
||||
import textwrap
|
||||
from collections.abc import Iterator
|
||||
from dataclasses import dataclass
|
||||
from pathlib import Path
|
||||
from tempfile import TemporaryDirectory
|
||||
from typing import Iterator
|
||||
|
||||
import pytest
|
||||
|
||||
@ -31,7 +31,7 @@ class DirenvProject:
|
||||
run(["direnv", "allow"], cwd=self.directory)
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
@pytest.fixture()
|
||||
def direnv_project(test_root: Path, project_root: Path) -> Iterator[DirenvProject]:
|
||||
"""
|
||||
Setups a direnv test project
|
||||
|
@ -1,4 +1,5 @@
|
||||
import logging
|
||||
import shlex
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
from typing import IO, Any
|
||||
@ -20,7 +21,7 @@ def run(
|
||||
) -> subprocess.CompletedProcess:
|
||||
if cwd is not None:
|
||||
log.debug(f"cd {cwd}")
|
||||
log.debug("$ " + " ".join(cmd))
|
||||
log.debug(f"$ {shlex.join(cmd)}")
|
||||
return subprocess.run(
|
||||
cmd, text=text, check=check, cwd=cwd, stderr=stderr, stdout=stdout, env=env
|
||||
)
|
||||
|
@ -6,7 +6,7 @@ TEST_ROOT = Path(__file__).parent.resolve()
|
||||
PROJECT_ROOT = TEST_ROOT.parent
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
@pytest.fixture()
|
||||
def test_root() -> Path:
|
||||
"""
|
||||
Root directory of the tests
|
||||
@ -14,7 +14,7 @@ def test_root() -> Path:
|
||||
return TEST_ROOT
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
@pytest.fixture()
|
||||
def project_root() -> Path:
|
||||
"""
|
||||
Root directory of the tests
|
||||
|
@ -10,6 +10,7 @@ from .procs import run
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def common_test(direnv_project: DirenvProject) -> None:
|
||||
run(["nix-collect-garbage"])
|
||||
|
||||
@ -52,7 +53,9 @@ def common_test_clean(direnv_project: DirenvProject) -> None:
|
||||
sys.stderr.write(out3.stderr)
|
||||
|
||||
files = [
|
||||
path for path in (direnv_project.directory / ".direnv").iterdir() if path.is_file()
|
||||
path
|
||||
for path in (direnv_project.directory / ".direnv").iterdir()
|
||||
if path.is_file()
|
||||
]
|
||||
rcs = [f for f in files if f.match("*.rc")]
|
||||
profiles = [f for f in files if not f.match("*.rc")]
|
||||
|
@ -1,5 +1,6 @@
|
||||
import logging
|
||||
import os
|
||||
import shlex
|
||||
import subprocess
|
||||
import sys
|
||||
import unittest
|
||||
@ -16,7 +17,7 @@ def direnv_exec(
|
||||
direnv_project: DirenvProject, cmd: str, env: dict[str, str] | None = None
|
||||
) -> None:
|
||||
args = ["direnv", "exec", str(direnv_project.directory), "sh", "-c", cmd]
|
||||
log.debug("$ " + " ".join(args))
|
||||
log.debug(f"$ {shlex.join(args)}")
|
||||
out = run(
|
||||
args,
|
||||
stderr=subprocess.PIPE,
|
||||
@ -28,7 +29,7 @@ def direnv_exec(
|
||||
sys.stdout.write(out.stdout)
|
||||
sys.stderr.write(out.stderr)
|
||||
assert out.returncode == 0
|
||||
assert "OK\n" == out.stdout
|
||||
assert out.stdout == "OK\n"
|
||||
assert "renewed cache" in out.stderr
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user