Skip to content

Commit

Permalink
tests: Remove provider_wait fixtures
Browse files Browse the repository at this point in the history
  • Loading branch information
apyrgio committed Oct 8, 2024
1 parent eddc06b commit 328ddbe
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 31 deletions.
25 changes: 0 additions & 25 deletions tests/isolation_provider/test_container.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,31 +21,6 @@ def provider() -> Container:
return Container()


class ContainerWait(Container):
"""Container isolation provider that blocks until the container has started."""

def exec_container(self, *args, **kwargs): # type: ignore [no-untyped-def]
# Check every 100ms if a container with the expected name has showed up.
# Else, closing the file descriptors may not work.
name = kwargs["name"]
runtime = self.get_runtime()
p = super().exec_container(*args, **kwargs)
for i in range(50):
containers = subprocess.run(
[runtime, "ps"], capture_output=True
).stdout.decode()
if name in containers:
return p
time.sleep(0.1)

raise RuntimeError(f"Container {name} did not start within 5 seconds")


@pytest.fixture
def provider_wait() -> ContainerWait:
return ContainerWait()


class TestContainer(IsolationProviderTest):
pass

Expand Down
7 changes: 1 addition & 6 deletions tests/isolation_provider/test_qubes.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
pytest.skip("Dummy conversion is enabled", allow_module_level=True)


@pytest.fixture
def provider() -> Qubes:
return Qubes()


class QubesWait(Qubes):
"""Qubes isolation provider that blocks until the disposable qube has started."""

Expand Down Expand Up @@ -53,7 +48,7 @@ def start_doc_to_pixels_proc(self, document: Document) -> subprocess.Popen:


@pytest.fixture
def provider_wait() -> QubesWait:
def provider() -> QubesWait:
return QubesWait()


Expand Down

0 comments on commit 328ddbe

Please sign in to comment.