move temporary directory to .direnv
This commit is contained in:
parent
66210d176f
commit
e970dcb658
@ -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
|
||||
|
||||
|
@ -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(
|
||||
|
Loading…
Reference in New Issue
Block a user