Upgrade testcontainers

marcggl · May 30, 2024 · e596537 · e596537
1 parent f35f839
commit e596537
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -58,16 +58,16 @@ dev = [
   "pymssql==2.3.0",
   # testcontainers 4.x have issues with Kafka on arm
   # https://github.com/testcontainers/testcontainers-python/issues/450
-  "testcontainers<4.0.0",
-  "testcontainers-minio",
-  "testcontainers-postgres",
-  "testcontainers-kafka",
-  "testcontainers[mssql]",
+#  "testcontainers<4.0.0",
+#  "testcontainers-minio",
+#  "testcontainers-postgres",
+#  "testcontainers-kafka",
 #  https://github.com/testcontainers/testcontainers-python/issues/554
-#  "testcontainers~=4.4.0",
-#  "testcontainers[minio]",
-#  "testcontainers[postgres]",
-#  "testcontainers[kafka]",
+  "testcontainers~=4.5.0",
+  "testcontainers[minio]",
+  "testcontainers[postgres]",
+  "testcontainers[kafka]",
+  "testcontainers[mssql]",
 ]
 
 [project.urls]

diff --git a/tests/test_test_kafka.py b/tests/test_test_kafka.py
@@ -32,10 +32,6 @@ def remove_container():
     request.addfinalizer(remove_container)
 
 
-@pytest.mark.skipif(
-    sys.platform == "darwin",
-    reason="Fails on ARM mac, https://github.com/testcontainers/testcontainers-python/issues/450",
-)
 def test_test_kafka(kafka_container: KafkaContainer):
     send_messages_to_topic("fixtures/kafka/data/messages.json", "inventory-events")
     data_contract_str = _setup_datacontract()

diff --git a/tests/test_test_postgres.py b/tests/test_test_postgres.py
@@ -25,8 +25,8 @@ def remove_container():
 
 
 def test_test_postgres(postgres_container, monkeypatch):
-    monkeypatch.setenv("DATACONTRACT_POSTGRES_USERNAME", postgres.POSTGRES_USER)
-    monkeypatch.setenv("DATACONTRACT_POSTGRES_PASSWORD", postgres.POSTGRES_PASSWORD)
+    monkeypatch.setenv("DATACONTRACT_POSTGRES_USERNAME", postgres.username)
+    monkeypatch.setenv("DATACONTRACT_POSTGRES_PASSWORD", postgres.password)
     # monkeypatch.setenv("DATACONTRACT_POSTGRES_USERNAME", postgres.username)
     # monkeypatch.setenv("DATACONTRACT_POSTGRES_PASSWORD", postgres.password)
     _init_sql()
@@ -51,9 +51,9 @@ def _setup_datacontract():
 
 def _init_sql():
     connection = psycopg2.connect(
-        database=postgres.POSTGRES_DB,
-        user=postgres.POSTGRES_USER,
-        password=postgres.POSTGRES_PASSWORD,
+        database=postgres.dbname,
+        user=postgres.username,
+        password=postgres.password,
         # database=postgres.dbname,
         # user=postgres.username,
         # password=postgres.password,