diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-04-24 10:53:40 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-04-24 16:26:23 +0200 |
| commit | 210feb6cc484a6c5c63c98f770de34e223f944cb (patch) | |
| tree | d1d841892a7ac87ac0d434194597606a375aaed1 /server/tests/api/users/users.ts | |
| parent | 9cc8d43e37a61709e7275c2a799bdf976dd940ca (diff) | |
| download | PeerTube-210feb6cc484a6c5c63c98f770de34e223f944cb.tar.gz PeerTube-210feb6cc484a6c5c63c98f770de34e223f944cb.tar.zst PeerTube-210feb6cc484a6c5c63c98f770de34e223f944cb.zip | |
Cleanup tests
Diffstat (limited to 'server/tests/api/users/users.ts')
| -rw-r--r-- | server/tests/api/users/users.ts | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts index 472ff511c..8efff12ad 100644 --- a/server/tests/api/users/users.ts +++ b/server/tests/api/users/users.ts | |||
| @@ -24,7 +24,7 @@ import { | |||
| 24 | registerUser, | 24 | registerUser, |
| 25 | removeUser, | 25 | removeUser, |
| 26 | removeVideo, | 26 | removeVideo, |
| 27 | runServer, | 27 | flushAndRunServer, |
| 28 | ServerInfo, | 28 | ServerInfo, |
| 29 | testImage, | 29 | testImage, |
| 30 | unblockUser, | 30 | unblockUser, |
| @@ -54,9 +54,7 @@ describe('Test users', function () { | |||
| 54 | 54 | ||
| 55 | before(async function () { | 55 | before(async function () { |
| 56 | this.timeout(30000) | 56 | this.timeout(30000) |
| 57 | 57 | server = await flushAndRunServer(1) | |
| 58 | await flushTests() | ||
| 59 | server = await runServer(1) | ||
| 60 | 58 | ||
| 61 | await setAccessTokensToServers([ server ]) | 59 | await setAccessTokensToServers([ server ]) |
| 62 | }) | 60 | }) |
| @@ -679,12 +677,7 @@ describe('Test users', function () { | |||
| 679 | }) | 677 | }) |
| 680 | }) | 678 | }) |
| 681 | 679 | ||
| 682 | after(async function () { | 680 | after(function () { |
| 683 | killallServers([ server ]) | 681 | killallServers([ server ]) |
| 684 | |||
| 685 | // Keep the logs if the test failed | ||
| 686 | if (this[ 'ok' ]) { | ||
| 687 | await flushTests() | ||
| 688 | } | ||
| 689 | }) | 682 | }) |
| 690 | }) | 683 | }) |