From 0d15e3098beb6ecdce0f842aa21ccf688b6a2820 Mon Sep 17 00:00:00 2001 From: Sylvain Mouquet Date: Sat, 30 Nov 2024 15:34:04 +0100 Subject: [PATCH] WIP: Work in progress --- pydocks/ubuntu.py | 4 ---- tests/test_ubuntu.py | 10 ++++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pydocks/ubuntu.py b/pydocks/ubuntu.py index 70d46d0..0dcba5f 100644 --- a/pydocks/ubuntu.py +++ b/pydocks/ubuntu.py @@ -4,13 +4,11 @@ import pytest_asyncio from python_on_whales import docker as libdocker -from reattempt import reattempt import logging import uuid from pydocks.plugin import ( clean_containers, - socket_test_connection, wait_and_run_container, ) @@ -93,5 +91,3 @@ def run_container(container_name: str): async for instance in wait_and_run_container(docker, container, container_name): yield instance - - diff --git a/tests/test_ubuntu.py b/tests/test_ubuntu.py index c4afa1f..5c71f31 100644 --- a/tests/test_ubuntu.py +++ b/tests/test_ubuntu.py @@ -1,6 +1,5 @@ import pytest import os -import redis.asyncio as redis from loguru import logger import pytest_asyncio @@ -13,7 +12,9 @@ async def begin_clean_all_containers(ubuntu_clean_all_containers): @pytest.mark.asyncio async def test_ubuntu_default_version(ubuntu_container): version_output = ubuntu_container.execute(["cat", "/etc/lsb-release"]) - assert 'DISTRIB_RELEASE=24.04' in version_output, f"Unexpected version output: {version_output}" + assert ( + "DISTRIB_RELEASE=24.04" in version_output + ), f"Unexpected version output: {version_output}" @pytest.fixture @@ -26,7 +27,9 @@ def custom_ubuntu_version(): @pytest.mark.asyncio async def test_ubuntu_custom_version(custom_ubuntu_version, ubuntu_container): version_output = ubuntu_container.execute(["cat", "/etc/lsb-release"]) - assert f'DISTRIB_RELEASE=22.04' in version_output, f"Unexpected version output: {version_output}" + assert ( + "DISTRIB_RELEASE=22.04" in version_output + ), f"Unexpected version output: {version_output}" @pytest.mark.asyncio @@ -34,4 +37,3 @@ async def test_ubuntu_execute_command(ubuntu_container): # Execute Redis CLI command result = ubuntu_container.execute(["echo", "Hello World"]) assert result.strip() == "Hello World" -