Fixed cyclic dependencie AND swapped pytest-parallel for pytest-xdist to fix deadlock in tests

This commit is contained in:
Qubasa
2023-10-16 15:03:53 +02:00
parent ecdd4949b7
commit 7bbadaa60f
25 changed files with 59 additions and 42 deletions

View File

@@ -5,7 +5,7 @@ from typing import Dict
from ..async_cmd import CmdOut, run, runforcli
from ..dirs import specific_flake_dir, specific_machine_dir
from ..errors import ClanError
from ..flakes.types import FlakeName
from ..types import FlakeName
from ..nix import nix_shell
log = logging.getLogger(__name__)

View File

@@ -1,5 +1,5 @@
from ..dirs import specific_machine_dir
from ..flakes.types import FlakeName
from ..types import FlakeName
def machine_has_fact(flake_name: FlakeName, machine: str, fact: str) -> bool:

View File

@@ -3,7 +3,7 @@ import logging
import os
from ..dirs import machines_dir
from ..flakes.types import FlakeName
from ..types import FlakeName
from .types import validate_hostname
log = logging.getLogger(__name__)