Skip to content

Commit 4e8b7f6

Browse files
CLDSRV-717: Fix metadata route hooks promise & cb
Fix Integration error: Error: Resolution method is overspecified. Specify a callback *or* return a Promise; not both.
1 parent 33e571e commit 4e8b7f6

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

tests/functional/raw-node/test/routes/routeMetadata.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,22 @@ describe('metadata routes with metadata', () => {
4444

4545
// E2E tests use S3C metadata, whereas functional tests use mocked metadata.
4646
if (process.env.S3_END_TO_END) {
47-
before(done => s3.createBucket({ Bucket: bucket1 }).promise()
47+
before(done => {
48+
s3.createBucket({ Bucket: bucket1 }).promise()
4849
.then(() => s3.putObject({ Bucket: bucket1, Key: keyName, Body: '' }).promise())
4950
.then(() => s3.createBucket({ Bucket: bucket2 }).promise())
50-
.then(() => done(), err => done(err))
51-
);
51+
.then(() => done())
52+
.catch(err => done(err));
53+
});
5254

53-
after(done => bucketUtil.empty(bucket1)
55+
after(done => {
56+
bucketUtil.empty(bucket1)
5457
.then(() => s3.deleteBucket({ Bucket: bucket1 }).promise())
5558
.then(() => bucketUtil.empty(bucket2))
5659
.then(() => s3.deleteBucket({ Bucket: bucket2 }).promise())
57-
.then(() => done(), err => done(err))
58-
);
60+
.then(() => done())
61+
.catch(err => done(err));
62+
});
5963
} else {
6064
let httpServer;
6165

0 commit comments

Comments
 (0)