Skip to content

Commit

Permalink
WIP: Work in progress
Browse files Browse the repository at this point in the history
  • Loading branch information
sylvainmouquet committed Nov 30, 2024
1 parent da4f857 commit 0d15e30
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
4 changes: 0 additions & 4 deletions pydocks/ubuntu.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)

Expand Down Expand Up @@ -93,5 +91,3 @@ def run_container(container_name: str):

async for instance in wait_and_run_container(docker, container, container_name):
yield instance


10 changes: 6 additions & 4 deletions tests/test_ubuntu.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import pytest
import os
import redis.asyncio as redis
from loguru import logger
import pytest_asyncio

Expand All @@ -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
Expand All @@ -26,12 +27,13 @@ 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
async def test_ubuntu_execute_command(ubuntu_container):
# Execute Redis CLI command
result = ubuntu_container.execute(["echo", "Hello World"])
assert result.strip() == "Hello World"

0 comments on commit 0d15e30

Please sign in to comment.