almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 09:52:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

tests: Remove provider_wait fixtures

Browse source
This commit is contained in:
Alex Pyrgiotis 2024-10-08 19:02:39 +03:00
parent 6e55e43fef
commit 1ca867c295
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
2 changed files with 1 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
tests/isolation_provider/test_container.py
View file

@ -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

7
tests/isolation_provider/test_qubes.py
View file

@ -20,11 +20,6 @@ elif os.environ.get("DUMMY_CONVERSION", False):
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."""
@ -53,7 +48,7 @@ class QubesWait(Qubes):
@pytest.fixture
def provider_wait() -> QubesWait:
def provider() -> QubesWait:
return QubesWait()