Merge pull request #361 from hexlet-basics/update-tests

Update tests

Author: fey

Dockerfile

@@ -1,12 +1,7 @@
 FROM hexletbasics/base-image
 
-# Configure versions and paths up front for better caching
 ARG PYTHON_VERSION=3.14
 
-# Keep project bin in PATH (existing convention)
-ENV PATH="/exercises-python/bin:${PATH}"
-
-# Install curl and CA certs (minimal), then install uv via official script
 ENV UV_INSTALL_DIR=/opt/uv
 ENV PATH="${UV_INSTALL_DIR}/bin:${PATH}"
 RUN apt-get update && apt-get install -y --no-install-recommends curl ca-certificates \
@@ -15,18 +10,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends curl ca-certifi
   && curl -fsSL https://astral.sh/uv/install.sh | sh \
   && ln -s ${UV_INSTALL_DIR}/* /usr/local/bin/
 
-# Create a dedicated virtualenv managed by uv with the requested Python
 ENV VIRTUAL_ENV=/opt/venv
-ENV UV_PYTHON_INSTALL_DIR=${VIRTUAL_ENV}
-RUN uv venv --allow-existing ${VIRTUAL_ENV} --python ${PYTHON_VERSION}
+RUN uv venv ${VIRTUAL_ENV} --python ${PYTHON_VERSION}
 
-# Activate venv for subsequent steps and point uv to it for project deps
-ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
+ENV PATH="${VIRTUAL_ENV}/bin:/exercises-python/bin:${PATH}"
 ENV UV_PROJECT_ENVIRONMENT=${VIRTUAL_ENV}
 
 WORKDIR /exercises-python
 
-# Cache dependencies: copy manifests first, sync, then copy the rest
 COPY pyproject.toml uv.lock ./
 RUN uv sync --locked
 

modules/10-basics/10-hello-world/index.py …les/10-basics/10-hello-world/solution.pymodules/10-basics/10-hello-world/index.py renamed to modules/10-basics/10-hello-world/solution.py modules/10-basics/10-hello-world/index.py renamed to modules/10-basics/10-hello-world/solution.py

@@ -0,0 +1,8 @@
+import runpy
+
+
+def test(capsys):
+    expected = "Hello, World!"
+    runpy.run_module('solution')
+    out, _ = capsys.readouterr()
+    assert out.strip() == expected

modules/10-basics/10-hello-world/test_code.py

@@ -1,5 +1,5 @@
 def test():
-    with open("index.py") as file:
+    with open("solution.py") as file:
         comment = file.read().rstrip()
         assert comment == "# TODO: добавить функцию приветствия"
         print(comment)

modules/10-basics/10-hello-world/test_solution.py

@@ -1,6 +1,8 @@
-from hexlet.test import expect_output
+import runpy
 
 
 def test(capsys):
     expected = "Заказ №1337\nСтатус: доставляется\nПримерный срок: 2 дня"
-    expect_output(capsys, expected)
+    runpy.run_module('solution')
+    out, _ = capsys.readouterr()
+    assert out.strip() == expected