From 1276e6504931cb7dc9e05c7a8eb9cb063bf21fb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 27 May 2025 14:42:48 +0900
Subject: [PATCH 1/2] fix(backend): follow-up of #16105 (#16109)

---
 packages/backend/test/unit/AnnouncementService.ts | 2 +-
 packages/backend/test/unit/RoleService.ts         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/test/unit/AnnouncementService.ts b/packages/backend/test/unit/AnnouncementService.ts
index 7b1ac30709..0b24f109f8 100644
--- a/packages/backend/test/unit/AnnouncementService.ts
+++ b/packages/backend/test/unit/AnnouncementService.ts
@@ -103,7 +103,7 @@ describe('AnnouncementService', () => {
 
 	afterEach(async () => {
 		await Promise.all([
-			app.get(DI.metasRepository).clear(),
+			app.get(DI.metasRepository).createQueryBuilder().delete().execute(),
 			usersRepository.createQueryBuilder().delete().execute(),
 			announcementsRepository.createQueryBuilder().delete().execute(),
 			announcementReadsRepository.createQueryBuilder().delete().execute(),
diff --git a/packages/backend/test/unit/RoleService.ts b/packages/backend/test/unit/RoleService.ts
index d87794e09f..306836ea43 100644
--- a/packages/backend/test/unit/RoleService.ts
+++ b/packages/backend/test/unit/RoleService.ts
@@ -159,7 +159,7 @@ describe('RoleService', () => {
 		clock.uninstall();
 
 		await Promise.all([
-			app.get(DI.metasRepository).clear(),
+			app.get(DI.metasRepository).createQueryBuilder().delete().execute(),
 			usersRepository.createQueryBuilder().delete().execute(),
 			rolesRepository.createQueryBuilder().delete().execute(),
 			roleAssignmentsRepository.createQueryBuilder().delete().execute(),

From e078cd929624250132b487d0a091420de0a49f93 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Tue, 27 May 2025 15:07:47 +0900
Subject: [PATCH 2/2] fix: jest.js exits with zero value even if underlying
 jest exited with non-zero value (#16111)

---
 packages/backend/jest.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/backend/jest.js b/packages/backend/jest.js
index 0cb2c2ab77..0e761d8c92 100644
--- a/packages/backend/jest.js
+++ b/packages/backend/jest.js
@@ -17,4 +17,15 @@ args.push(...[
 	...process.argv.slice(2),
 ]);
 
-child_process.spawn(process.execPath, args, { stdio: 'inherit' });
+const child = child_process.spawn(process.execPath, args, { stdio: 'inherit' });
+child.on('error', (err) => {
+	console.error('Failed to start Jest:', err);
+	process.exit(1);
+});
+child.on('exit', (code, signal) => {
+	if (code === null) {
+		process.exit(128 + signal);
+	} else {
+		process.exit(code);
+	}
+});