Skip to content

Commit 540b955

Browse files
SouravSourav
authored andcommitted
fix zip upload log
1 parent cdcf071 commit 540b955

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

bin/helpers/zipUpload.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,35 +52,33 @@ const uploadSuits = (bsConfig, filePath, opts, obj) => {
5252
var r = request.post(options, function (err, resp, body) {
5353

5454
if (err) {
55-
logger.error(utils.formatRequest(err, resp, body));
56-
reject(err);
55+
reject({message: err, stacktrace: utils.formatRequest(err, resp, body)});
5756
} else {
5857
try {
5958
responseData = JSON.parse(body);
6059
} catch (e) {
6160
responseData = {};
6261
}
6362
if (resp.statusCode != 200) {
64-
logger.error(utils.formatRequest(err, resp, body));
6563
if (resp.statusCode == 401) {
6664
if (responseData && responseData["error"]) {
6765
responseData["time"] = Date.now() - obj.startTime;
68-
return reject(responseData["error"]);
66+
return reject({message: responseData["error"], stacktrace: utils.formatRequest(err, resp, body)});
6967
} else {
70-
return reject(Constants.validationMessages.INVALID_DEFAULT_AUTH_PARAMS);
68+
return reject({message: Constants.validationMessages.INVALID_DEFAULT_AUTH_PARAMS, stacktrace: utils.formatRequest(err, resp, body)});
7169
}
7270
}
7371
if (!opts.propogateError){
7472
return resolve({});
7573
}
7674
if(responseData && responseData["error"]){
7775
responseData["time"] = Date.now() - obj.startTime;
78-
reject(responseData["error"]);
76+
reject({message: responseData["error"], stacktrace: utils.formatRequest(err, resp, body)});
7977
} else {
8078
if (resp.statusCode == 413) {
81-
reject(Constants.userMessages.ZIP_UPLOAD_LIMIT_EXCEEDED);
79+
reject({message: Constants.userMessages.ZIP_UPLOAD_LIMIT_EXCEEDED, stacktrace: utils.formatRequest(err, resp, body)});
8280
} else {
83-
reject(Constants.userMessages.ZIP_UPLOADER_NOT_REACHABLE);
81+
reject({message: Constants.userMessages.ZIP_UPLOADER_NOT_REACHABLE, stacktrace: utils.formatRequest(err, resp, body)});
8482
}
8583
}
8684
} else {
@@ -151,7 +149,8 @@ const uploadCypressZip = (bsConfig, md5data, packageData) => {
151149
}).catch((error) => {
152150
testZipUploadObj.bar1 && purgeUploadBar(testZipUploadObj);
153151
npmPackageZipUploadObj.bar1 && purgeUploadBar(npmPackageZipUploadObj);
154-
return reject(error);
152+
logger.error(error.stacktrace)
153+
return reject(error.message);
155154
})
156155
})
157156
}

test/unit/bin/helpers/zipUpload.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ describe("zipUpload", () => {
8585
chai.assert.fail("Promise error");
8686
})
8787
.catch((error) => {
88-
chai.assert.equal(error.message, "test error");
88+
chai.assert.equal(error.message.message, "test error");
8989
});
9090
});
9191

@@ -219,7 +219,7 @@ describe("zipUpload", () => {
219219
chai.assert.fail("Promise error");
220220
})
221221
.catch((error) => {
222-
chai.assert.equal(error, "auth failed");
222+
chai.assert.equal(error.message, "auth failed");
223223
});
224224
});
225225

@@ -249,7 +249,7 @@ describe("zipUpload", () => {
249249
chai.assert.fail("Promise error");
250250
})
251251
.catch((error) => {
252-
chai.assert.equal(error, constant.validationMessages.INVALID_DEFAULT_AUTH_PARAMS);
252+
chai.assert.equal(error.message, constant.validationMessages.INVALID_DEFAULT_AUTH_PARAMS);
253253
});
254254
});
255255

@@ -311,7 +311,7 @@ describe("zipUpload", () => {
311311
chai.assert.fail("Promise error");
312312
})
313313
.catch((error) => {
314-
chai.assert.deepEqual(error, "test error");
314+
chai.assert.deepEqual(error.message, "test error");
315315
});
316316
});
317317

@@ -342,7 +342,7 @@ describe("zipUpload", () => {
342342
chai.assert.fail("Promise error");
343343
})
344344
.catch((error) => {
345-
chai.assert.deepEqual(error, constant.userMessages.ZIP_UPLOAD_LIMIT_EXCEEDED);
345+
chai.assert.deepEqual(error.message, constant.userMessages.ZIP_UPLOAD_LIMIT_EXCEEDED);
346346
});
347347
});
348348

@@ -373,7 +373,7 @@ describe("zipUpload", () => {
373373
chai.assert.fail("Promise error");
374374
})
375375
.catch((error) => {
376-
chai.assert.deepEqual(error, constant.userMessages.ZIP_UPLOADER_NOT_REACHABLE);
376+
chai.assert.deepEqual(error.message, constant.userMessages.ZIP_UPLOADER_NOT_REACHABLE);
377377
});
378378
});
379379
});
@@ -427,7 +427,7 @@ describe("zipUpload", () => {
427427
chai.assert.fail("Promise error");
428428
})
429429
.catch((error) => {
430-
chai.assert.equal(error, "test error");
430+
chai.assert.equal(error.message, "test error");
431431
});
432432
});
433433
});

0 commit comments

Comments
 (0)