Change helper function

Author: marceloneppel

tests/integration/helpers.py

@@ -30,7 +30,7 @@ async def check_database_users_existence(
     """
     unit = ops_test.model.applications[DATABASE_APP_NAME].units[0]
     unit_address = await get_unit_address(ops_test, unit.name)
-    password = await get_operator_password(ops_test)
+    password = await get_password(ops_test)
 
     # Retrieve all users in the database.
     output = await execute_query_on_unit(
@@ -61,7 +61,7 @@ async def check_database_creation(ops_test: OpsTest, database: str) -> None:
         ops_test: The ops test framework
         database: Name of the database that should have been created
     """
-    password = await get_operator_password(ops_test)
+    password = await get_password(ops_test)
 
     for unit in ops_test.model.applications[DATABASE_APP_NAME].units:
         unit_address = await get_unit_address(ops_test, unit.name)
@@ -196,12 +196,12 @@ def get_application_units(ops_test: OpsTest, application_name: str) -> List[str]
     ]
 
 
-async def get_operator_password(ops_test: OpsTest):
-    """Retrieve the operator user password using the action."""
+async def get_password(ops_test: OpsTest, username: str = "operator"):
+    """Retrieve a user password using the action."""
     unit = ops_test.model.units.get(f"{DATABASE_APP_NAME}/0")
-    action = await unit.run_action("get-password")
+    action = await unit.run_action("get-password", **{"username": username})
     result = await action.wait()
-    return result.results["operator-password"]
+    return result.results[f"{username}-password"]
 
 
 async def get_primary(ops_test: OpsTest, unit_id=0) -> str:

tests/integration/test_charm.py

@@ -18,7 +18,7 @@
     convert_records_to_dict,
     get_application_units,
     get_cluster_members,
-    get_operator_password,
+    get_password,
     get_unit_address,
     scale_application,
 )
@@ -74,7 +74,7 @@ async def test_database_is_up(ops_test: OpsTest, unit_id: int):
 
 @pytest.mark.parametrize("unit_id", UNIT_IDS)
 async def test_settings_are_correct(ops_test: OpsTest, unit_id: int):
-    password = await get_operator_password(ops_test)
+    password = await get_password(ops_test)
 
     # Connect to PostgreSQL.
     host = await get_unit_address(ops_test, f"{APP_NAME}/{unit_id}")
@@ -162,7 +162,7 @@ async def test_scale_down_and_up(ops_test: OpsTest):
 async def test_persist_data_through_graceful_restart(ops_test: OpsTest):
     """Test data persists through a graceful restart."""
     primary = await get_primary(ops_test)
-    password = await get_operator_password(ops_test)
+    password = await get_password(ops_test)
     address = await get_unit_address(ops_test, primary)
 
     # Write data to primary IP.
@@ -190,7 +190,7 @@ async def test_persist_data_through_graceful_restart(ops_test: OpsTest):
 async def test_persist_data_through_failure(ops_test: OpsTest):
     """Test data persists through a failure."""
     primary = await get_primary(ops_test)
-    password = await get_operator_password(ops_test)
+    password = await get_password(ops_test)
     address = await get_unit_address(ops_test, primary)
 
     # Write data to primary IP.