tests: access tc properties through function call

and assert not none to make mypy happy.

Author: matthiasschaub

core/tests/test_reusable_containers.py

@@ -17,11 +17,12 @@ def test_docker_container_reuse_default():
     wait_for_logs(container, "Hello from Docker!")
 
     assert container._reuse == False
-    assert testcontainers_config.tc_properties_testcontainers_reuse_enable == False
+    assert testcontainers_config.tc_properties_testcontainers_reuse_enable() == False
     assert Reaper._socket is not None
 
     container.stop()
     containers = DockerClient().client.containers.list(all=True)
+    assert container._container is not None
     assert container._container.id not in [container.id for container in containers]
 
 
@@ -33,16 +34,13 @@ def test_docker_container_with_reuse_reuse_disabled(caplog):
     wait_for_logs(container, "Hello from Docker!")
 
     assert container._reuse == True
-    assert testcontainers_config.tc_properties_testcontainers_reuse_enable == False
-    assert (
-        "Reuse was requested (`with_reuse`) but the environment does not support the "
-        + "reuse of containers. To enable container reuse, add "
-        + "'testcontainers.reuse.enable=true' to '~/.testcontainers.properties'."
-    ) in caplog.text
+    assert testcontainers_config.tc_properties_testcontainers_reuse_enable() == False
+    assert ("Reuse was requested (`with_reuse`) but the environment does not support the ") in caplog.text
     assert Reaper._socket is not None
 
     container.stop()
     containers = DockerClient().client.containers.list(all=True)
+    assert container._container is not None
     assert container._container.id not in [container.id for container in containers]
 
 
@@ -57,11 +55,12 @@ def test_docker_container_without_reuse_reuse_enabled(monkeypatch):
     wait_for_logs(container, "Hello from Docker!")
 
     assert container._reuse == False
-    assert testcontainers_config.tc_properties_testcontainers_reuse_enable == True
+    assert testcontainers_config.tc_properties_testcontainers_reuse_enable() == True
     assert Reaper._socket is not None
 
     container.stop()
     containers = DockerClient().client.containers.list(all=True)
+    assert container._container is not None
     assert container._container.id not in [container.id for container in containers]
 
 
@@ -78,7 +77,9 @@ def test_docker_container_with_reuse_reuse_enabled(monkeypatch):
     assert Reaper._socket is None
 
     containers = DockerClient().client.containers.list(all=True)
+    assert container._container is not None
     assert container._container.id in [container.id for container in containers]
+
     # Cleanup after keeping container alive (with_reuse)
     container.stop()
 
@@ -91,8 +92,10 @@ def test_docker_container_with_reuse_reuse_enabled_same_id(monkeypatch):
     monkeypatch.setattr(testcontainers_config, "tc_properties", tc_properties_mock)
 
     container_1 = DockerContainer("hello-world").with_reuse().start()
+    assert container_1._container is not None
     id_1 = container_1._container.id
     container_2 = DockerContainer("hello-world").with_reuse().start()
+    assert container_2._container is not None
     id_2 = container_2._container.id
     assert Reaper._socket is None
     assert id_1 == id_2
@@ -104,14 +107,16 @@ def test_docker_container_with_reuse_reuse_enabled_same_id(monkeypatch):
 def test_docker_container_labels_hash_default():
     # w/out reuse
     with DockerContainer("hello-world") as container:
-        assert container._container.labels["hash"] == ""
+        assert container._container is not None
+        assert "hash" not in container._container.labels.keys()
 
 
 def test_docker_container_labels_hash(monkeypatch):
     tc_properties_mock = testcontainers_config.tc_properties | {"testcontainers.reuse.enable": "true"}
     monkeypatch.setattr(testcontainers_config, "tc_properties", tc_properties_mock)
     expected_hash = "1bade17a9d8236ba71ffbb676f2ece3fb419ea0e6adb5f82b5a026213c431d8e"
     with DockerContainer("hello-world").with_reuse() as container:
+        assert container._container is not None
         assert container._container.labels["hash"] == expected_hash
 
 
@@ -124,6 +129,7 @@ def test_docker_client_find_container_by_hash_existing(monkeypatch):
     tc_properties_mock = testcontainers_config.tc_properties | {"testcontainers.reuse.enable": "true"}
     monkeypatch.setattr(testcontainers_config, "tc_properties", tc_properties_mock)
     with DockerContainer("hello-world").with_reuse() as container:
+        assert container._container is not None
         hash_ = container._container.labels["hash"]
         found_container = DockerClient().find_container_by_hash(hash_)
         assert isinstance(found_container, Container)