From cfd4e03c82f546de2f05208b83240f3400ef40de Mon Sep 17 00:00:00 2001 From: undefined Date: Mon, 4 Apr 2022 21:58:37 +0800 Subject: [PATCH] ci: fix adm-zip types --- packages/hydrooj/package.json | 2 +- test/main.ts | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 72198e3d..77e60088 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -53,7 +53,7 @@ "tx2": "^1.0.5" }, "devDependencies": { - "@types/adm-zip": "^0.5.0", + "@types/adm-zip": "^0.4.34", "@types/fs-extra": "^9.0.13", "@types/js-yaml": "^4.0.5", "@types/koa": "^2.13.4", diff --git a/test/main.ts b/test/main.ts index 2d5210cf..1ff91822 100644 --- a/test/main.ts +++ b/test/main.ts @@ -14,10 +14,14 @@ describe('App', () => { let agent: supertest.SuperAgentTest; before('init', function init(done) { this.timeout(30000); - bus.on('app/started', () => setTimeout(() => { + let timeout; + const resolve = () => setTimeout(() => { + clearTimeout(timeout); agent = supertest.agent(require('hydrooj/src/service/server').server); done(); - }, 2000)); + }, 2000); + bus.on('app/started', resolve); + timeout = setTimeout(resolve, 20000); }); const routes = ['/', '/api', '/p', '/contest', '/homework', '/user/1', '/training'];