From 9839b3dadac9d629a22ffbf8c0d70da2c6672ecb Mon Sep 17 00:00:00 2001
From: Dan Helfman <witten@torsion.org>
Date: Sat, 9 May 2026 11:05:28 -0700
Subject: [PATCH] Fix end-to-end database tests (#1303).

---
 tests/end-to-end/hooks/data_source/test_database.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/end-to-end/hooks/data_source/test_database.py b/tests/end-to-end/hooks/data_source/test_database.py
index 9b212c2b..aed8e0a7 100644
--- a/tests/end-to-end/hooks/data_source/test_database.py
+++ b/tests/end-to-end/hooks/data_source/test_database.py
@@ -57,11 +57,15 @@ mariadb_databases:
       hostname: mariadb
       username: root
       password: test
+      # Needed for restoring users to the system database, because we're not actually dropping
+      # users first. (Dropping root and mariadb.sys would cause problems.)
+      restore_options: --force
     - name: all
       {mariadb_mysql_dump_format_option}
       hostname: mariadb
       username: root
       password: test
+      restore_options: --force
 mysql_databases:
     - name: test
       hostname: not-actually-mysql
@@ -132,6 +136,7 @@ mariadb_databases:
       restore_port: 3307
       restore_username: root
       restore_password: test2
+      restore_options: --force
 mysql_databases:
     - name: test
       container: not-actually-mysql
@@ -201,6 +206,7 @@ mariadb_databases:
       restore_port: 3307
       restore_username: root
       restore_password: test2
+      restore_options: --force
 mysql_databases:
     - name: test
       hostname: not-actually-mysql