From 1522c5fed3437c0bd6efebbe1a287064f1b276fb Mon Sep 17 00:00:00 2001 From: Jahed Ahmed Date: Thu, 19 Aug 2021 15:48:16 +0000 Subject: [PATCH] test: server.close uses callbacks, not promises --- test/jest/acceptance/oauth-token.spec.ts | 4 ++-- test/jest/system/lib/commands/fix/fix.spec.ts | 4 ++-- test/system/cli.test.ts | 4 +++- test/system/remote-package.test.ts | 4 +++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/test/jest/acceptance/oauth-token.spec.ts b/test/jest/acceptance/oauth-token.spec.ts index 3daa5f186d0..d77bb445dbe 100644 --- a/test/jest/acceptance/oauth-token.spec.ts +++ b/test/jest/acceptance/oauth-token.spec.ts @@ -20,8 +20,8 @@ describe('test using OAuth token', () => { server.listen(apiPort, () => done()); }); - afterAll(async () => { - await server.close(); + afterAll((done) => { + server.close(() => done()); }); it('successfully tests a project with an OAuth env variable set', async () => { diff --git a/test/jest/system/lib/commands/fix/fix.spec.ts b/test/jest/system/lib/commands/fix/fix.spec.ts index 135bc4a80af..42933e7b467 100644 --- a/test/jest/system/lib/commands/fix/fix.spec.ts +++ b/test/jest/system/lib/commands/fix/fix.spec.ts @@ -36,8 +36,8 @@ describe('snyk fix (system tests)', () => { }); }); - afterAll(async () => { - await server.close(); + afterAll((done) => { + server.close(() => done()); }); it( diff --git a/test/system/cli.test.ts b/test/system/cli.test.ts index d95c4d64019..88b450ec454 100644 --- a/test/system/cli.test.ts +++ b/test/system/cli.test.ts @@ -409,7 +409,9 @@ after('teardown', async (t) => { delete process.env.SNYK_PORT; t.notOk(process.env.SNYK_PORT, 'fake env values cleared'); - await server.close(); + await new Promise((resolve) => { + server.close(resolve); + }); t.pass('server shutdown'); let key = 'set'; let value = 'api=' + oldKey; diff --git a/test/system/remote-package.test.ts b/test/system/remote-package.test.ts index adf829117f6..649fa333086 100644 --- a/test/system/remote-package.test.ts +++ b/test/system/remote-package.test.ts @@ -209,7 +209,9 @@ after('teardown', async (t) => { delete process.env.SNYK_PORT; t.notOk(process.env.SNYK_PORT, 'fake env values cleared'); - await server.close(); + await new Promise((resolve) => { + server.close(resolve); + }); t.pass('server shutdown'); let key = 'set'; let value = 'api=' + oldkey;