From 50e1ee18fa55e7270bd83c38cc5eae0c8559570a Mon Sep 17 00:00:00 2001
From: samunohito <46447427+samunohito@users.noreply.github.com>
Date: Wed, 3 Jul 2024 07:18:07 +0900
Subject: [PATCH] fix merge

---
 packages/backend/test/e2e/timelines.ts | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/packages/backend/test/e2e/timelines.ts b/packages/backend/test/e2e/timelines.ts
index 7df65a5986..7ab8dcf46e 100644
--- a/packages/backend/test/e2e/timelines.ts
+++ b/packages/backend/test/e2e/timelines.ts
@@ -13,17 +13,8 @@ import { setTimeout } from 'node:timers/promises';
 import { entities } from 'misskey-js';
 import { Redis } from 'ioredis';
 import { afterEach, beforeAll } from '@jest/globals';
+import { api, initTestDb, post, randomString, sendEnvUpdateRequest, signup, uploadUrl, UserToken } from '../utils.js';
 import { loadConfig } from '@/config.js';
-import {
-	api,
-	initTestDb,
-	post,
-	randomString,
-	sendEnvUpdateRequest,
-	signup,
-	uploadUrl,
-	UserToken,
-} from '../utils.js';
 
 function genHost() {
 	return randomString() + '.example.com';
@@ -59,7 +50,7 @@ async function pushList(listId: string, pushUserIds: string[] = [], user: UserTo
 	for (const userId of pushUserIds) {
 		await api('users/lists/push', { listId, userId }, user);
 	}
-	await sleep(500);
+	await setTimeout(500);
 }
 
 async function createRole(name: string, user: UserToken): Promise<entities.AdminRolesCreateResponse> {