pytest-simcore safe changes

Author: sanderegg

packages/pytest-simcore/src/pytest_simcore/file_extra.py

@@ -4,7 +4,7 @@
 
 import pytest
 from faker import Faker
-from pydantic import ByteSize
+from pydantic import ByteSize, NonNegativeInt
 from pytest_simcore.helpers.logging_tools import log_context
 
 
@@ -26,6 +26,37 @@ def _creator(size: ByteSize, name: str | None = None) -> Path:
     return _creator
 
 
+def _create_random_content(
+    faker: Faker,
+    *,
+    base_dir: Path,
+    file_min_size: ByteSize,
+    file_max_size: ByteSize,
+    remaining_size: ByteSize,
+    depth: NonNegativeInt | None,
+) -> ByteSize:
+    if remaining_size <= 0:
+        return remaining_size
+
+    file_size = ByteSize(
+        faker.pyint(
+            min_value=min(file_min_size, remaining_size),
+            max_value=min(remaining_size, file_max_size),
+        )
+    )
+    if depth is None:
+        depth = faker.pyint(0, 5)
+    file_path = base_dir / f"{faker.unique.file_path(depth=depth, absolute=False)}"
+    file_path.parent.mkdir(parents=True, exist_ok=True)
+    assert not file_path.exists()
+    with file_path.open("wb") as fp:
+        fp.write(f"I am a {file_size.human_readable()} file".encode())
+        fp.truncate(file_size)
+    assert file_path.exists()
+
+    return ByteSize(remaining_size - file_size)
+
+
 @pytest.fixture
 def create_folder_of_size_with_multiple_files(
     tmp_path: Path, faker: Faker
@@ -34,33 +65,12 @@ def _create_folder_of_size_with_multiple_files(
         directory_size: ByteSize,
         file_min_size: ByteSize,
         file_max_size: ByteSize,
+        depth: NonNegativeInt | None = None,
     ) -> Path:
         # Helper function to create random files and directories
         assert file_min_size > 0
         assert file_min_size <= file_max_size
 
-        def create_random_content(base_dir: Path, remaining_size: ByteSize) -> ByteSize:
-            if remaining_size <= 0:
-                return remaining_size
-
-            # Decide to create a file or a subdirectory
-            # Create a file
-            file_size = ByteSize(
-                faker.pyint(
-                    min_value=min(file_min_size, remaining_size),
-                    max_value=min(remaining_size, file_max_size),
-                )
-            )  # max file size 1MB
-            file_path = base_dir / f"{faker.file_path(depth=4, absolute=False)}"
-            file_path.parent.mkdir(parents=True, exist_ok=True)
-            assert not file_path.exists()
-            with file_path.open("wb") as fp:
-                fp.write(f"I am a {file_size.human_readable()} file".encode())
-                fp.truncate(file_size)
-            assert file_path.exists()
-
-            return ByteSize(remaining_size - file_size)
-
         # Recursively create content in the temporary directory
         remaining_size = directory_size
         with log_context(
@@ -70,7 +80,14 @@ def create_random_content(base_dir: Path, remaining_size: ByteSize) -> ByteSize:
         ) as ctx:
             num_files_created = 0
             while remaining_size > 0:
-                remaining_size = create_random_content(tmp_path, remaining_size)
+                remaining_size = _create_random_content(
+                    faker,
+                    base_dir=tmp_path,
+                    file_min_size=file_min_size,
+                    file_max_size=file_max_size,
+                    remaining_size=remaining_size,
+                    depth=depth,
+                )
                 num_files_created += 1
             ctx.logger.info("created %s files", num_files_created)
         return tmp_path

packages/pytest-simcore/src/pytest_simcore/helpers/httpx_assert_checks.py

@@ -20,7 +20,7 @@ def assert_status(
     response_model: type[T] | None,
     *,
     expected_msg: str | None = None,
-    is_enveloped: bool = True,
+    expect_envelope: bool = True,
 ) -> tuple[T | None, Any]:
     """
     Asserts for enveloped responses
@@ -36,7 +36,7 @@ def assert_status(
     if expected_status_code == status.HTTP_204_NO_CONTENT:
         assert response.text == ""
         return None, None
-    if is_enveloped:
+    if expect_envelope:
         validated_response = TypeAdapter(Envelope[response_model]).validate_json(
             response.text
         )
@@ -49,6 +49,8 @@ def assert_status(
                 expected_status_code,
                 expected_msg,
             )
+        else:
+            assert data is not None
         return data, error
 
     if is_error(expected_status_code):