Skip to content

Commit f8e33fe

Browse files
committed
object tests updates post unused functions removal
1 parent 884e1da commit f8e33fe

File tree

1 file changed

+30
-18
lines changed

1 file changed

+30
-18
lines changed

tests/functional/raw-node/test/GCP/object/completeMpu.js

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const { GCP, GcpUtils } = arsenal.storage.data.external.GCP;
66
const {
77
gcpMpuSetup,
88
genUniqID,
9+
gcpRetry,
910
} = require('../../../utils/gcpUtils');
1011
const { getRealAwsConfig } =
1112
require('../../../../aws-node-sdk/test/support/awsConfig');
@@ -99,36 +100,47 @@ describe('GCP: Complete MPU', function testSuite() {
99100
before(done => {
100101
config = getRealAwsConfig(credentialOne);
101102
gcpClient = new GCP(config);
102-
async.eachSeries(Object.values(bucketNames),
103-
(bucket, next) => {
104-
const cmd = new CreateBucketCommand({ Bucket: bucket.Name });
105-
gcpClient.send(cmd)
106-
.then(() => next())
107-
.catch(err => {
108-
process.stdout.write(`err in creating bucket ${err}\n`);
109-
return next(err);
110-
});
111-
},
112-
done);
103+
const buckets = Object.values(bucketNames);
104+
async.eachSeries(
105+
buckets,
106+
(bucket, next) => gcpRetry(
107+
gcpClient,
108+
() => new CreateBucketCommand({ Bucket: bucket.Name }),
109+
null,
110+
err => {
111+
if (err) {
112+
process.stdout.write(
113+
`err in creating bucket ${err}\n`);
114+
}
115+
return next(err);
116+
},
117+
),
118+
done,
119+
);
113120
});
114121

115122
after(done => {
116-
async.eachSeries(Object.values(bucketNames),
123+
const buckets = Object.values(bucketNames);
124+
async.eachSeries(
125+
buckets,
117126
(bucket, next) => emptyBucket(gcpClient, bucket.Name, err => {
118127
assert.equal(err, null,
119128
`Expected success, but got error ${err}`);
120-
const cmd = new DeleteBucketCommand({ Bucket: bucket.Name });
121-
gcpClient.send(cmd)
122-
.then(() => next())
123-
.catch(error => {
129+
gcpRetry(
130+
gcpClient,
131+
() => new DeleteBucketCommand({ Bucket: bucket.Name }),
132+
null,
133+
error => {
124134
if (error) {
125135
process.stdout.write(
126136
`err in deleting bucket ${error}\n`);
127137
}
128138
return next(error);
129-
});
139+
},
140+
);
130141
}),
131-
done);
142+
done,
143+
);
132144
});
133145

134146
describe('when MPU has 0 parts', () => {

0 commit comments

Comments
 (0)