personal nits

canonical · Sep 17, 2024 · 61c48b9 · 61c48b9
1 parent 3a9e402
commit 61c48b9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -12,6 +12,9 @@
     get_application_name,
 )
 
+TEST_DB = "continuous_writes_database"
+TEST_COLL = "test_collection"
+
 
 @pytest_asyncio.fixture
 async def continuous_writes(ops_test: OpsTest) -> None:
@@ -20,15 +23,21 @@ async def continuous_writes(ops_test: OpsTest) -> None:
 
     application_unit = ops_test.model.applications[application_name].units[0]
 
-    clear_writes_action = await application_unit.run_action("clear-continuous-writes")
+    clear_writes_action = await application_unit.run_action(
+        "clear-continuous-writes", **{"db-name": TEST_DB, "coll-name": TEST_COLL}
+    )
     await clear_writes_action.wait()
 
-    start_writes_action = await application_unit.run_action("start-continuous-writes")
+    start_writes_action = await application_unit.run_action(
+        "start-continuous-writes", **{"db-name": TEST_DB, "coll-name": TEST_COLL}
+    )
     await start_writes_action.wait()
 
     yield
 
-    clear_writes_action = await application_unit.run_action("clear-continuous-writes")
+    clear_writes_action = await application_unit.run_action(
+        "clear-continuous-writes", **{"db-name": TEST_DB, "coll-name": TEST_COLL}
+    )
     await clear_writes_action.wait()
 
 

diff --git a/tests/integration/ha_tests/application_charm/src/charm.py b/tests/integration/ha_tests/application_charm/src/charm.py
@@ -25,7 +25,6 @@
 
 DATABASE_NAME = "continuous_writes_database"
 COLLECTION_NAME = "test_collection"
-COLLECTION_NAME = "continuous_writes_database"
 PEER = "application-peers"
 PROC_PID_KEY = "proc-pid"
 LAST_WRITTEN_FILE = "last_written_value"

diff --git a/tests/integration/sharding_tests/writes_helpers.py b/tests/integration/sharding_tests/writes_helpers.py
@@ -66,7 +66,6 @@ async def count_shard_writes(
     connection_string = await mongodb_uri(ops_test, app_name=config_server_name, port=MONGOS_PORT)
 
     client = MongoClient(connection_string)
-    print(connection_string)
     db = client[db_name]
     test_collection = db[collection_name]
     count = test_collection.count_documents({})

diff --git a/tests/integration/upgrades/test_upgrades.py b/tests/integration/upgrades/test_upgrades.py
@@ -30,11 +30,8 @@
 @pytest.mark.group(1)
 @pytest.mark.abort_on_fail
 async def test_build_and_deploy(ops_test: OpsTest):
-
     await deploy_and_scale_application(ops_test)
-
     db_app_name = await get_app_name(ops_test)
-
     if db_app_name:
         await check_or_scale_app(ops_test, db_app_name, required_units=2)
         return