yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'move temporary directory to .direnv' (#355) from Mic92-main into main

Browse Source
This commit is contained in:
clan-bot
2023-09-27 14:15:34 +00:00
parent e74102ae9a 2a7c8b6b1a
commit 5d790accdb
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/clan-cli/tests/root.py
View File

@@ -4,19 +4,17 @@ from pathlib import Path
import pytest
TEST_ROOT = Path(__file__).parent.resolve()
PROJECT_ROOT = TEST_ROOT.parent
CLAN_CORE_ = os.environ.get("CLAN_CORE")
if CLAN_CORE_:
PROJECT_ROOT = TEST_ROOT.parent.parent.parent
if CLAN_CORE_ := os.environ.get("CLAN_CORE"):
CLAN_CORE = Path(CLAN_CORE_)
else:
CLAN_CORE = PROJECT_ROOT.parent.parent
CLAN_CORE = PROJECT_ROOT
@pytest.fixture(scope="session")
def project_root() -> Path:
"""
Root directory the clan-cli
Root directory the clan-core
"""
return PROJECT_ROOT

7
pkgs/clan-cli/tests/sshd.py
View File

@@ -33,8 +33,11 @@ class SshdConfig:
@pytest.fixture(scope="session")
def sshd_config(project_root: Path, test_root: Path) -> Iterator[SshdConfig]:
# FIXME, if any parent of `project_root` is world-writable than sshd will refuse it.
with TemporaryDirectory(dir=project_root) as _dir:
# FIXME, if any parent of the sshd directory is world-writable than sshd will refuse it.
# we use .direnv instead since it's already in .gitignore
direnv = project_root / ".direnv"
direnv.mkdir(exist_ok=True)
with TemporaryDirectory(dir=direnv) as _dir:
dir = Path(_dir)
host_key = dir / "host_ssh_host_ed25519_key"
subprocess.run(