Skip to content

Commit a85b0a4

Browse files
committed
CI | Increase Timeouts
Signed-off-by: shirady <57721533+shirady@users.noreply.github.com>
1 parent 411b1e1 commit a85b0a4

File tree

2 files changed

+21
-16
lines changed

2 files changed

+21
-16
lines changed

src/test/unit_tests/jest_tests/test_versioning_concurrency.test.js

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ const buffer_utils = require('../../../util/buffer_utils');
1010
const { TMP_PATH } = require('../../system_tests/test_utils');
1111
const { crypto_random_string } = require('../../../util/string_utils');
1212
const endpoint_stats_collector = require('../../../sdk/endpoint_stats_collector');
13+
const SECONDS = 1000;
14+
const test_timeout = SECONDS * 60;
1315

1416
function make_dummy_object_sdk(nsfs_config, uid, gid) {
1517
return {
@@ -68,7 +70,7 @@ describe('test versioning concurrency', () => {
6870
expect(failed_operations).toHaveLength(0);
6971
const versions = await nsfs.list_object_versions({ bucket: bucket }, DUMMY_OBJECT_SDK);
7072
expect(versions.objects.length).toBe(num_of_concurrency);
71-
});
73+
}, test_timeout);
7274

7375
it('multiple delete version id and key', async () => {
7476
const bucket = 'bucket1';
@@ -88,7 +90,7 @@ describe('test versioning concurrency', () => {
8890
await P.delay(1000);
8991
expect(successful_operations).toHaveLength(num_of_concurrency);
9092
expect(failed_operations).toHaveLength(0);
91-
});
93+
}, test_timeout);
9294

9395
// same as s3tests_boto3/functional/test_s3.py::test_versioning_concurrent_multi_object_delete,
9496
// this test has a bug, it tries to create the bucket twice and fails
@@ -130,7 +132,7 @@ describe('test versioning concurrency', () => {
130132
}
131133
const list_res = await nsfs.list_objects({ bucket: bucket }, DUMMY_OBJECT_SDK);
132134
expect(list_res.objects.length).toBe(0);
133-
}, 8000);
135+
}, test_timeout);
134136

135137
it('concurrent delete of latest version', async () => {
136138
const bucket = 'bucket1';
@@ -154,7 +156,7 @@ describe('test versioning concurrency', () => {
154156
expect(versions.objects.length).toBe(8); // 5 versions before + 3 delete markers concurrent
155157
const delete_marker_arr = versions.objects.filter(object => object.delete_marker === true);
156158
expect(delete_marker_arr.length).toBe(3);
157-
});
159+
}, test_timeout);
158160

159161
it('concurrent put object and head object latest version', async () => {
160162
const bucket = 'bucket1';
@@ -182,7 +184,7 @@ describe('test versioning concurrency', () => {
182184
expect(successful_head_operations.length).toBe(number_of_iterations);
183185
const versions = await nsfs.list_object_versions({ bucket: bucket }, DUMMY_OBJECT_SDK);
184186
expect(versions.objects.length).toBe(number_of_iterations + 1); // 1 version before + 10 versions concurrent
185-
});
187+
}, test_timeout);
186188

187189
it('concurrent puts & delete latest objects', async () => {
188190
const bucket = 'bucket1';
@@ -216,7 +218,7 @@ describe('test versioning concurrency', () => {
216218
expect(num_of_delete_markers).toBe(num_of_concurrency);
217219
const num_of_latest_versions = (versions.objects.filter(version => version.is_latest === true)).length;
218220
expect(num_of_latest_versions).toBe(1);
219-
}, 6000);
221+
}, test_timeout);
220222

221223
it('concurrent puts & delete objects by version id', async () => {
222224
const bucket = 'bucket1';
@@ -250,7 +252,7 @@ describe('test versioning concurrency', () => {
250252
expect(num_of_delete_markers).toBe(0);
251253
const num_of_latest_versions = (versions.objects.filter(version => version.is_latest === true)).length;
252254
expect(num_of_latest_versions).toBe(1);
253-
}, 6000);
255+
}, test_timeout);
254256

255257
it('concurrent delete objects by version id/latest', async () => {
256258
const bucket = 'bucket1';
@@ -283,7 +285,7 @@ describe('test versioning concurrency', () => {
283285
expect(num_of_delete_markers).toBe(num_of_concurrency);
284286
const num_of_latest_versions = (versions.objects.filter(version => version.is_latest === true)).length;
285287
expect(num_of_latest_versions).toBe(1);
286-
}, 6000);
288+
}, test_timeout);
287289

288290
it('nested key - concurrent delete multiple objects', async () => {
289291
const bucket = 'bucket1';
@@ -320,8 +322,7 @@ describe('test versioning concurrency', () => {
320322
}
321323
const list_res = await nsfs.list_objects({ bucket: bucket }, DUMMY_OBJECT_SDK);
322324
expect(list_res.objects).toHaveLength(0);
323-
}, 8000);
324-
325+
}, test_timeout);
325326

326327
it('nested key - concurrent puts & deletes', async () => {
327328
const bucket = 'bucket1';
@@ -349,7 +350,7 @@ describe('test versioning concurrency', () => {
349350
expect(upload_failed_operations).toHaveLength(0);
350351
expect(delete_successful_operations).toHaveLength(num_of_concurrency);
351352
expect(delete_failed_operations).toHaveLength(0);
352-
}, 6000);
353+
}, test_timeout);
353354

354355
it('concurrent puts & list versions', async () => {
355356
const bucket = 'bucket1';
@@ -389,7 +390,7 @@ describe('test versioning concurrency', () => {
389390
expect(num_of_delete_markers).toBe(0);
390391
const num_of_latest_versions = (versions.objects.filter(version => version.is_latest === true)).length;
391392
expect(num_of_latest_versions).toBe(initial_num_of_objects);
392-
}, 60000);
393+
}, test_timeout);
393394

394395
it('concurrent puts & list versions - version id paging', async () => {
395396
const bucket = 'bucket1';
@@ -432,7 +433,7 @@ describe('test versioning concurrency', () => {
432433
expect(num_of_delete_markers).toBe(0);
433434
const num_of_latest_versions = (merged_versions.filter(version => version.is_latest === true)).length;
434435
expect(num_of_latest_versions).toBe(initial_num_of_objects);
435-
}, 50000);
436+
}, test_timeout);
436437
});
437438

438439
/**

src/test/unit_tests/test_bucketspace_versioning.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ mocha.describe('bucketspace namespace_fs - versioning', function() {
7171
const suspended_dir1_versions_path = path.join(suspended_full_path, dir1, '.versions/');
7272

7373
mocha.before(async function() {
74-
this.timeout(600000); // eslint-disable-line no-invalid-this
74+
this.timeout(0); // eslint-disable-line no-invalid-this
7575
if (invalid_nsfs_root_permissions()) this.skip(); // eslint-disable-line no-invalid-this
7676
// create paths
7777
await fs_utils.create_fresh_path(tmp_fs_root, 0o777);
@@ -158,6 +158,7 @@ mocha.describe('bucketspace namespace_fs - versioning', function() {
158158
});
159159

160160
mocha.after(async () => {
161+
this.timeout(0); // eslint-disable-line no-invalid-this
161162
fs_utils.folder_delete(tmp_fs_root);
162163
for (const email of accounts) {
163164
await rpc_client.account.delete_account({ email });
@@ -2285,7 +2286,7 @@ mocha.describe('bucketspace namespace_fs - versioning', function() {
22852286
const version_body = 'A1A1A1A';
22862287

22872288
mocha.before(async function() {
2288-
this.timeout(600000); // eslint-disable-line no-invalid-this
2289+
this.timeout(0); // eslint-disable-line no-invalid-this
22892290
if (invalid_nsfs_root_permissions()) this.skip(); // eslint-disable-line no-invalid-this
22902291
// create paths
22912292
await fs_utils.create_fresh_path(tmp_fs_root2, 0o777);
@@ -2355,6 +2356,7 @@ mocha.describe('bucketspace namespace_fs - versioning', function() {
23552356
});
23562357

23572358
mocha.after(async () => {
2359+
this.timeout(0); // eslint-disable-line no-invalid-this
23582360
fs_utils.folder_delete(tmp_fs_root);
23592361
for (const email of accounts) {
23602362
await rpc_client.account.delete_account({ email });
@@ -2953,7 +2955,7 @@ mocha.describe('List-objects', function() {
29532955
let file_pointer;
29542956

29552957
mocha.before(async function() {
2956-
this.timeout(600000); // eslint-disable-line no-invalid-this
2958+
this.timeout(0); // eslint-disable-line no-invalid-this
29572959
if (process.getgid() !== 0 || process.getuid() !== 0) {
29582960
console.log('No Root permissions found in env. Skipping test');
29592961
this.skip(); // eslint-disable-line no-invalid-this
@@ -3038,6 +3040,7 @@ mocha.describe('List-objects', function() {
30383040
});
30393041

30403042
mocha.after(async () => {
3043+
this.timeout(0); // eslint-disable-line no-invalid-this
30413044
if (file_pointer) await file_pointer.close(DEFAULT_FS_CONFIG);
30423045
fs_utils.folder_delete(tmp_fs_root);
30433046
for (const email of accounts) {
@@ -3046,6 +3049,7 @@ mocha.describe('List-objects', function() {
30463049
});
30473050

30483051
mocha.beforeEach(async () => {
3052+
this.timeout(0); // eslint-disable-line no-invalid-this
30493053
await fs_utils.create_fresh_path(full_path2, 0o777);
30503054
await P.delay(100); // sometime we saw that the check failed although the path is created a line before
30513055
const file_exists = await fs_utils.file_exists(full_path2);

0 commit comments

Comments
 (0)