NO-JIRA: deduplicate testcontainer helpers in the TestBaseImage test class (#2760)

Author: jiridanek

tests/containers/base_image_test.py

@@ -30,20 +30,9 @@
 class TestBaseImage:
     """Tests that are applicable for all images we have in this repository."""
 
-    def _run_test(self, image: str, test_fn: Callable[[testcontainers.core.container.DockerContainer], None]):
-        container = testcontainers.core.container.DockerContainer(image=image, user=23456, group_add=[0])
-        container.with_command("/bin/sh -c 'sleep infinity'")
-        try:
-            container.start()
+    def _run_test(self, image: str, test_fn: Callable[[testcontainers.core.container.DockerContainer], None]) -> None:
+        with self._test_container(image) as container:
             test_fn(container)
-            return
-        except Exception as e:
-            pytest.fail(f"Unexpected exception in test: {e}")
-        finally:
-            docker_utils.NotebookContainer(container).stop(timeout=0)
-
-        # If the return doesn't happen in the try block, fail the test
-        pytest.fail("The test did not pass as expected.")
 
     @contextlib.contextmanager
     def _test_container(self, image: str) -> Generator[testcontainers.core.container.DockerContainer]:
@@ -59,8 +48,7 @@ def _test_container(self, image: str) -> Generator[testcontainers.core.container
         finally:
             docker_utils.NotebookContainer(container).stop(timeout=0)
 
-        # If the return doesn't happen in the try block, fail the test
-        pytest.fail("The test did not pass as expected.")
+        raise RuntimeError("Cannot happen: the test did not pass as expected.")
 
     def test_elf_files_can_link_runtime_libs(self, subtests: pytest_subtests.SubTests, image):
         def test_fn(container: testcontainers.core.container.DockerContainer):