Remove all individual test timeouts and ignore timeouts toplevel

This commit is contained in:
Johannes Zellner
2018-12-01 00:50:22 +01:00
parent f5f92fbb03
commit 54c96d98d1
17 changed files with 15 additions and 62 deletions
-6
View File
@@ -73,8 +73,6 @@ describe('backups', function () {
});
describe('cleanup', function () {
this.timeout(20000);
var BACKUP_0 = {
id: 'backup-box-0',
version: '1.0.0',
@@ -286,8 +284,6 @@ describe('backups', function () {
});
it('can backup', function (done) {
this.timeout(6000);
createBackup(function (error, result) {
expect(error).to.be(null);
expect(fs.statSync(path.join(gBackupConfig.backupFolder, 'snapshot/box.tar.gz')).nlink).to.be(2); // hard linked to a rotated backup
@@ -300,8 +296,6 @@ describe('backups', function () {
});
it('can take another backup', function (done) {
this.timeout(6000);
createBackup(function (error, result) {
expect(error).to.be(null);
expect(fs.statSync(path.join(gBackupConfig.backupFolder, 'snapshot/box.tar.gz')).nlink).to.be(2); // hard linked to a rotated backup
-2
View File
@@ -98,8 +98,6 @@ const TEST_DOMAIN = {
};
describe('database', function () {
this.timeout(5000);
before(function (done) {
config._reset();
config.setFqdn(TEST_DOMAIN.domain);
-1
View File
@@ -42,7 +42,6 @@ describe('Dockerproxy', function () {
});
// uncomment this to run the proxy for manual testing
// this.timeout(1000000);
// it('wait', function (done) {} );
it('can get info', function (done) {
-2
View File
@@ -202,8 +202,6 @@ function cleanup(done) {
}
describe('Ldap', function () {
this.timeout(10000);
before(setup);
after(cleanup);
-2
View File
@@ -20,8 +20,6 @@ function cleanup(done) {
}
describe('Server', function () {
this.timeout(5000);
before(function () {
config._reset();
config.setFqdn(DOMAIN);
+3 -8
View File
@@ -16,9 +16,8 @@ var BackupsError = require('../backups.js').BackupsError,
path = require('path'),
rimraf = require('rimraf'),
mkdirp = require('mkdirp'),
recursive_readdir = require("recursive-readdir"),
recursive_readdir = require('recursive-readdir'),
s3 = require('../storage/s3.js'),
debug = require('debug')('box:storage-test'),
gcs = require('../storage/gcs.js'),
chunk = require('lodash.chunk');
@@ -203,8 +202,6 @@ describe('Storage', function () {
});
describe('s3', function () {
this.timeout(10000);
var gS3Folder;
var gBackupConfig = {
provider: 's3',
@@ -297,8 +294,6 @@ describe('Storage', function () {
});
describe('gcs', function () {
this.timeout(10000);
var gBackupConfig = {
provider: 'gcs',
key: '',
@@ -351,7 +346,7 @@ describe('Storage', function () {
.pipe(fs.createWriteStream(ensurePathWritable(dst)))
.on('end', cb)
.on('error', notFoundHandler)
;
;
}
};
};
@@ -375,7 +370,7 @@ describe('Storage', function () {
cb(null, gFiles, q.pageToken < chunkedFiles.length ? q : null);
});
}
}
};
}};
};
gcs._mockInject(mockGCS);