Skip to content

Commit dd058e6

Browse files
committed
fixup
1 parent 96cab61 commit dd058e6

1 file changed

Lines changed: 12 additions & 29 deletions

File tree

tests/functional/aws-node-sdk/test/object/objectCopy.js

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -82,38 +82,23 @@ describe('Object Copy', () => {
8282
let lastModified;
8383

8484

85-
before(() => {
86-
bucketUtil = new BucketUtility('default', sigCfg);
87-
s3 = bucketUtil.s3;
88-
return bucketUtil.empty(sourceBucketName)
89-
.then(() =>
90-
bucketUtil.empty(destBucketName)
91-
)
92-
.then(() =>
93-
bucketUtil.deleteMany([sourceBucketName, destBucketName])
94-
)
95-
.catch(err => {
85+
before(async () => {
86+
try {
87+
bucketUtil = new BucketUtility('default', sigCfg);
88+
s3 = bucketUtil.s3;
89+
await bucketUtil.empty(sourceBucketName);
90+
await bucketUtil.empty(destBucketName);
91+
await bucketUtil.deleteMany([sourceBucketName, destBucketName]);
92+
} catch (err) {
9693
if (err.name !== 'NoSuchBucket') {
9794
process.stdout.write(`${err}\n`);
9895
throw err;
9996
}
100-
})
101-
.then(() => {
102-
bucketUtil.createOne(sourceBucketName).catch(err => {
103-
console.log('Error creating source bucket', err);
104-
});
105-
})
106-
.then(() => {
107-
bucketUtil.createOne(destBucketName).catch(err => {
108-
console.log('Error creating dest bucket', err);
109-
});
110-
})
111-
.catch(err => {
112-
throw err;
113-
});
97+
}
98+
await bucketUtil.createOne(sourceBucketName);
99+
await bucketUtil.createOne(destBucketName);
114100
});
115101

116-
117102
beforeEach(() => s3.send(new PutObjectCommand({
118103
Bucket: sourceBucketName,
119104
Key: sourceObjName,
@@ -140,7 +125,7 @@ describe('Object Copy', () => {
140125
await bucketUtil.empty(destBucketName, true);
141126
});
142127

143-
after(async() => await bucketUtil.deleteMany([sourceBucketName, destBucketName]));
128+
after(async () => await bucketUtil.deleteMany([sourceBucketName, destBucketName]));
144129

145130
function requestCopy(fields, cb) {
146131
s3.send(new CopyObjectCommand(Object.assign({
@@ -1365,11 +1350,9 @@ describe('Object Copy', () => {
13651350
Key: destObjName,
13661351
CopySource: `${sourceBucketName}/${sourceObjName}`,
13671352
})).then(res => {
1368-
console.log('COPY RES', res);
13691353
successCopyCheck(null, res.CopyObjectResult, originalMetadata,
13701354
destBucketName, destObjName, done);
13711355
}).catch(err => {
1372-
console.log('COPY ERR', err);
13731356
checkNoError(err);
13741357
done();
13751358
});

0 commit comments

Comments
 (0)