From 5d66bb879464adb2f23d764a3602f967748069d0 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sat, 5 Jun 2021 14:54:07 +0900
Subject: ランダムにテストがコケるのを修正 (#7553)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Test shutdown

* Revert "Test shutdown"

This reverts commit 85182e7dd196cdd9ecb46cfb50adaabd04c5ba60.

* Skip beforeShutdown in test

* Wait shutdown in test

* Revert "Skip beforeShutdown in test"

This reverts commit 79c33ab53615e8fa4820d2abfc2494cba55c441c.

* Revert "Revert "Skip beforeShutdown in test""

This reverts commit 3423133a137c79b64f3ff6ef9dbe433a441a47b0.
---
 test/user-notes.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'test/user-notes.ts')

diff --git a/test/user-notes.ts b/test/user-notes.ts
index 349d5fdb7c..4af8ce0cc7 100644
--- a/test/user-notes.ts
+++ b/test/user-notes.ts
@@ -12,7 +12,7 @@ process.env.NODE_ENV = 'test';
 
 import * as assert from 'assert';
 import * as childProcess from 'child_process';
-import { async, signup, request, post, uploadFile, launchServer } from './utils';
+import { async, signup, request, post, uploadFile, launchServer, shutdownServer } from './utils';
 
 describe('users/notes', () => {
 	let p: childProcess.ChildProcess;
@@ -37,8 +37,8 @@ describe('users/notes', () => {
 		});
 	}));
 
-	after(() => {
-		p.kill();
+	after(async() => {
+		await shutdownServer(p);
 	});
 
 	it('ファイルタイプ指定 (jpg)', async(async () => {
-- 
cgit v1.2.3-freya