Fix integration test database name (#30)

carlcsaposs-canonical · web-flow · commit 27b2f4e6ff84 · 2025-09-02T10:31:29.000Z
canonical/mysql-test-app#51
diff --git a/kubernetes/tests/integration/helpers.py b/kubernetes/tests/integration/helpers.py
@@ -27,7 +27,7 @@
 
 logger = logging.getLogger(__name__)
 
-CONTINUOUS_WRITES_DATABASE_NAME = "continuous_writes_database"
+CONTINUOUS_WRITES_DATABASE_NAME = "continuous_writes"
 CONTINUOUS_WRITES_TABLE_NAME = "data"
 
 MYSQL_DEFAULT_APP_NAME = "mysql-k8s"
diff --git a/kubernetes/tests/integration/test_charm.py b/kubernetes/tests/integration/test_charm.py
@@ -109,7 +109,7 @@ async def test_database_relation(ops_test: OpsTest, charm):
     server_config_credentials = await get_server_config_credentials(mysql_unit)
 
     select_inserted_data_sql = [
-        f"SELECT data FROM continuous_writes_database.random_data WHERE data = '{inserted_data}'",
+        f"SELECT data FROM continuous_writes.random_data WHERE data = '{inserted_data}'",
     ]
     selected_data = await execute_queries_against_unit(
         mysql_unit_address,
diff --git a/machines/tests/integration/helpers.py b/machines/tests/integration/helpers.py
@@ -16,7 +16,7 @@
 
 logger = logging.getLogger(__name__)
 
-CONTINUOUS_WRITES_DATABASE_NAME = "continuous_writes_database"
+CONTINUOUS_WRITES_DATABASE_NAME = "continuous_writes"
 CONTINUOUS_WRITES_TABLE_NAME = "data"
 
 MYSQL_DEFAULT_APP_NAME = "mysql"
diff --git a/machines/tests/integration/test_database.py b/machines/tests/integration/test_database.py
@@ -22,7 +22,7 @@
 MYSQL_APP_NAME = MYSQL_DEFAULT_APP_NAME
 MYSQL_ROUTER_APP_NAME = MYSQL_ROUTER_DEFAULT_APP_NAME
 APPLICATION_APP_NAME = APPLICATION_DEFAULT_APP_NAME
-TEST_DATABASE = "continuous_writes_database"
+TEST_DATABASE = "continuous_writes"
 TEST_TABLE = "random_data"
 SLOW_TIMEOUT = 15 * 60
 

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ async def test_database_relation(ops_test: OpsTest, charm):`
`109`	`109`	`server_config_credentials = await get_server_config_credentials(mysql_unit)`
`110`	`110`
`111`	`111`	`select_inserted_data_sql = [`
`112`		`- f"SELECT data FROM continuous_writes_database.random_data WHERE data = '{inserted_data}'",`
	`112`	`+ f"SELECT data FROM continuous_writes.random_data WHERE data = '{inserted_data}'",`
`113`	`113`	`]`
`114`	`114`	`selected_data = await execute_queries_against_unit(`
`115`	`115`	`mysql_unit_address,`