Skip to content

Commit 2955d37

Browse files
benzekrimahabenzekrimaha
committed
bucket test async functions introduction
1 parent b476392 commit 2955d37

4 files changed

Lines changed: 82 additions & 174 deletions

File tree

‎tests/functional/raw-node/test/GCP/bucket/get.js‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,28 +75,18 @@ function removeObjects(createdObjects, callback) {
7575
describe('GCP: GET Bucket', function testSuite() {
7676
this.timeout(180000);
7777

78-
before(done => {
78+
before(async () => {
7979
const command = new CreateBucketCommand({
8080
Bucket: bucketName,
8181
});
82-
gcpClient.send(command)
83-
.then(() => done())
84-
.catch(err => {
85-
process.stdout.write(`err in creating bucket ${err}\n`);
86-
return done(err);
87-
});
82+
await gcpClient.send(command);
8883
});
8984

90-
after(done => {
85+
after(async () => {
9186
const command = new DeleteBucketCommand({
9287
Bucket: bucketName,
9388
});
94-
gcpClient.send(command)
95-
.then(() => done())
96-
.catch(err => {
97-
process.stdout.write(`err in deleting bucket ${err}\n`);
98-
return done(err);
99-
});
89+
await gcpClient.send(command);
10090
});
10191

10292
describe('without existing bucket', () => {

‎tests/functional/raw-node/test/GCP/bucket/getVersioning.js‎

Lines changed: 24 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -20,86 +20,42 @@ describe('GCP: GET Bucket Versioning', () => {
2020
const config = getRealAwsConfig(credentialOne);
2121
const gcpClient = new GCP(config);
2222

23-
beforeEach(function beforeFn(done) {
23+
beforeEach(async function beforeFn() {
2424
this.currentTest.bucketName = `somebucket-${genUniqID()}`;
2525
const cmd = new CreateBucketCommand({
2626
Bucket: this.currentTest.bucketName,
2727
});
28-
gcpClient.send(cmd)
29-
.then(() => done())
30-
.catch(err => {
31-
process.stdout
32-
.write(`err in creating bucket ${err.code}\n`);
33-
return done(err);
34-
});
28+
await gcpClient.send(cmd);
3529
});
3630

37-
afterEach(function afterFn(done) {
31+
afterEach(async function afterFn() {
3832
const cmd = new DeleteBucketCommand({
3933
Bucket: this.currentTest.bucketName,
4034
});
41-
gcpClient.send(cmd)
42-
.then(() => done())
43-
.catch(err => {
44-
if (err) {
45-
process.stdout
46-
.write(`err in deleting bucket ${err.code}\n`);
47-
}
48-
return done(err);
49-
});
35+
await gcpClient.send(cmd);
5036
});
5137

52-
it('should verify bucket versioning is enabled', function testFn(done) {
53-
return async.waterfall([
54-
// Enable versioning using the official SDK client
55-
next => {
56-
const command = new PutBucketVersioningCommand({
57-
Bucket: this.test.bucketName,
58-
VersioningConfiguration: { Status: 'Enabled' },
59-
});
60-
return gcpClient.send(command)
61-
.then(() => next())
62-
.catch(err => next(err));
63-
},
64-
// Verify using GetBucketVersioningCommand
65-
next => {
66-
const command = new GetBucketVersioningCommand({
67-
Bucket: this.test.bucketName,
68-
});
69-
return gcpClient.send(command)
70-
.then(res => {
71-
assert.deepStrictEqual(res.Status, verEnabledObj);
72-
return next();
73-
})
74-
.catch(err => next(err));
75-
},
76-
], err => done(err));
38+
it('should verify bucket versioning is enabled', async function testFn() {
39+
await gcpClient.send(new PutBucketVersioningCommand({
40+
Bucket: this.test.bucketName,
41+
VersioningConfiguration: { Status: 'Enabled' },
42+
}));
43+
44+
const res = await gcpClient.send(new GetBucketVersioningCommand({
45+
Bucket: this.test.bucketName,
46+
}));
47+
assert.deepStrictEqual(res.Status, verEnabledObj);
7748
});
7849

79-
it('should verify bucket versioning is disabled', function testFn(done) {
80-
return async.waterfall([
81-
// Disable versioning using the official SDK client
82-
next => {
83-
const command = new PutBucketVersioningCommand({
84-
Bucket: this.test.bucketName,
85-
VersioningConfiguration: { Status: 'Suspended' },
86-
});
87-
return gcpClient.send(command)
88-
.then(() => next())
89-
.catch(err => next(err));
90-
},
91-
// Verify using GetBucketVersioningCommand
92-
next => {
93-
const command = new GetBucketVersioningCommand({
94-
Bucket: this.test.bucketName,
95-
});
96-
return gcpClient.send(command)
97-
.then(res => {
98-
assert.deepStrictEqual(res.Status, verDisabledObj);
99-
return next();
100-
})
101-
.catch(err => next(err));
102-
},
103-
], err => done(err));
50+
it('should verify bucket versioning is disabled', async function testFn() {
51+
await gcpClient.send(new PutBucketVersioningCommand({
52+
Bucket: this.test.bucketName,
53+
VersioningConfiguration: { Status: 'Suspended' },
54+
}));
55+
56+
const res = await gcpClient.send(new GetBucketVersioningCommand({
57+
Bucket: this.test.bucketName,
58+
}));
59+
assert.deepStrictEqual(res.Status, verDisabledObj);
10460
});
10561
});

‎tests/functional/raw-node/test/GCP/bucket/head.js‎

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -16,62 +16,56 @@ describe('GCP: HEAD Bucket', () => {
1616
const gcpClient = new GCP(config);
1717

1818
describe('without existing bucket', () => {
19-
beforeEach(function beforeFn(done) {
19+
beforeEach(function beforeFn() {
2020
this.currentTest.bucketName = `somebucket-${genUniqID()}`;
21-
return done();
2221
});
2322

24-
it('should return 404', function testFn(done) {
25-
gcpClient.headBucket({
26-
Bucket: this.test.bucketName,
27-
}, err => {
23+
it('should return 404', async function testFn() {
24+
const badBucketName = this.test.bucketName;
25+
try {
26+
await gcpClient.headBucket({ Bucket: badBucketName });
27+
assert.fail('Expected 404 error, but got success');
28+
} catch (err) {
2829
assert(err);
2930
assert.strictEqual(err.$metadata?.httpStatusCode, 404);
30-
return done();
31-
});
31+
}
3232
});
3333
});
3434

3535
describe('with existing bucket', () => {
36-
beforeEach(function beforeFn(done) {
36+
beforeEach(async function beforeFn() {
3737
this.currentTest.bucketName = `somebucket-${genUniqID()}`;
3838
process.stdout
3939
.write(`Creating test bucket ${this.currentTest.bucketName}\n`);
4040
const cmd = new CreateBucketCommand({
4141
Bucket: this.currentTest.bucketName,
4242
});
43-
gcpClient.send(cmd)
44-
.then(() => done())
45-
.catch(err => done(err));
43+
await gcpClient.send(cmd);
4644
});
4745

48-
afterEach(function afterFn(done) {
46+
afterEach(async function afterFn() {
4947
const cmd = new DeleteBucketCommand({
5048
Bucket: this.currentTest.bucketName,
5149
});
52-
gcpClient.send(cmd)
53-
.then(() => done())
54-
.catch(err => {
55-
process.stdout
56-
.write(`err deleting bucket: ${err.code}\n`);
57-
return done(err);
58-
});
50+
try {
51+
await gcpClient.send(cmd);
52+
} catch (err) {
53+
process.stdout
54+
.write(`err deleting bucket: ${err.code}\n`);
55+
}
5956
});
6057

61-
it('should get bucket information', function testFn(done) {
62-
gcpClient.headBucket({
58+
it('should get bucket information', async function testFn() {
59+
const res = await gcpClient.headBucket({
6360
Bucket: this.test.bucketName,
64-
}, (err, res) => {
65-
assert.equal(err, null, `Expected success, but got ${err}`);
66-
const { $metadata, ...data } = res;
67-
assert.strictEqual($metadata.httpStatusCode, 200);
68-
// Ensure MetaVersionId is present and non-empty
69-
assert.ok(
70-
typeof data.MetaVersionId === 'string'
71-
&& data.MetaVersionId.length > 0
72-
);
73-
return done();
7461
});
62+
const { $metadata, ...data } = res;
63+
assert.strictEqual($metadata.httpStatusCode, 200);
64+
// Ensure MetaVersionId is present and non-empty
65+
assert.ok(
66+
typeof data.MetaVersionId === 'string'
67+
&& data.MetaVersionId.length > 0
68+
);
7569
});
7670
});
7771
});

‎tests/functional/raw-node/test/GCP/bucket/putVersioning.js‎

Lines changed: 28 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -21,73 +21,41 @@ describe('GCP: PUT Bucket Versioning', () => {
2121
const config = getRealAwsConfig(credentialOne);
2222
const gcpClient = new GCP(config);
2323

24-
before(done => {
24+
before(async () => {
2525
const cmd = new CreateBucketCommand({ Bucket: bucketName });
26-
gcpClient.send(cmd)
27-
.then(() => done())
28-
.catch(err => {
29-
process.stdout.write(`err in creating bucket ${err}\n`);
30-
return done(err);
31-
});
26+
await gcpClient.send(cmd);
3227
});
3328

34-
after(done => {
29+
after(async () => {
3530
const cmd = new DeleteBucketCommand({ Bucket: bucketName });
36-
gcpClient.send(cmd)
37-
.then(() => done())
38-
.catch(err => {
39-
process.stdout.write(`err in deleting bucket ${err}\n`);
40-
return done(err);
41-
});
31+
await gcpClient.send(cmd);
4232
});
4333

44-
it('should enable bucket versioning', done => async.waterfall([
45-
next => {
46-
const cmd = new PutBucketVersioningCommand({
47-
Bucket: bucketName,
48-
VersioningConfiguration: {
49-
Status: 'Enabled',
50-
},
51-
});
52-
return gcpClient.send(cmd)
53-
.then(() => next())
54-
.catch(err => next(err));
34+
it('should enable bucket versioning', async () => {
35+
await gcpClient.send(new PutBucketVersioningCommand({
36+
Bucket: bucketName,
37+
VersioningConfiguration: {
38+
Status: 'Enabled',
5539
},
56-
next => {
57-
const cmd = new GetBucketVersioningCommand({
58-
Bucket: bucketName,
59-
});
60-
return gcpClient.send(cmd)
61-
.then(res => {
62-
assert.strictEqual(res.Status, verEnabledStatus);
63-
return next();
64-
})
65-
.catch(err => next(err));
66-
},
67-
], err => done(err)));
40+
}));
6841

69-
it('should disable bucket versioning', done => async.waterfall([
70-
next => {
71-
const cmd = new PutBucketVersioningCommand({
72-
Bucket: bucketName,
73-
VersioningConfiguration: {
74-
Status: 'Suspended',
75-
},
76-
});
77-
return gcpClient.send(cmd)
78-
.then(() => next())
79-
.catch(err => next(err));
80-
},
81-
next => {
82-
const cmd = new GetBucketVersioningCommand({
83-
Bucket: bucketName,
84-
});
85-
return gcpClient.send(cmd)
86-
.then(res => {
87-
assert.strictEqual(res.Status, verDisabledStatus);
88-
return next();
89-
})
90-
.catch(err => next(err));
42+
const res = await gcpClient.send(new GetBucketVersioningCommand({
43+
Bucket: bucketName,
44+
}));
45+
assert.strictEqual(res.Status, verEnabledStatus);
46+
});
47+
48+
it('should disable bucket versioning', async () => {
49+
await gcpClient.send(new PutBucketVersioningCommand({
50+
Bucket: bucketName,
51+
VersioningConfiguration: {
52+
Status: 'Suspended',
9153
},
92-
], err => done(err)));
54+
}));
55+
56+
const res = await gcpClient.send(new GetBucketVersioningCommand({
57+
Bucket: bucketName,
58+
}));
59+
assert.strictEqual(res.Status, verDisabledStatus);
60+
});
9361
});

0 commit comments

Comments
 (0)