Skip to content

Commit 08ceaf1

Browse files
okbang9okbang9
committed
简化分片上传v2测试用例 规范代码
1 parent 7d73c29 commit 08ceaf1

File tree

3 files changed

+19
-137
lines changed

3 files changed

+19
-137
lines changed

‎qiniu/rpc.js‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,6 @@ function post (requestURI, requestForm, headers, callbackFunc) {
6464

6565
var req = urllib.request(requestURI, data, function (respErr, respBody,
6666
respInfo) {
67-
// var end = parseInt(Date.now() / 1000);
68-
// console.log((end - start) + " seconds");
69-
// console.log("queuing:\t" + respInfo.timing.queuing);
70-
// console.log("dnslookup:\t" + respInfo.timing.dnslookup);
71-
// console.log("connected:\t" + respInfo.timing.connected);
72-
// console.log("requestSent:\t" + respInfo.timing.requestSent);
73-
// console.log("waiting:\t" + respInfo.timing.waiting);
74-
// console.log("contentDownload:\t" + respInfo.timing.contentDownload);
75-
7667
callbackFunc(respErr, respBody, respInfo);
7768
});
7869

‎qiniu/storage/resume.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ function putReq (config, uploadToken, key, rsStream, rsStreamLen, putExtra, call
138138
}
139139

140140
} else {
141-
throw new Error("分片上传版本号错误")
141+
throw new Error("part upload version number error")
142142
}
143143
} catch (e) {
144144
//log(e)
@@ -170,7 +170,6 @@ function putReq (config, uploadToken, key, rsStream, rsStreamLen, putExtra, call
170170
}
171171
if (putExtra.resumeRecordFile) {
172172
var contents = JSON.stringify(finishedBlkPutRets);
173-
// console.log('write resume record ' + putExtra.resumeRecordFile);
174173
fs.writeFileSync(putExtra.resumeRecordFile, contents, {
175174
encoding: 'utf-8'
176175
});
@@ -204,12 +203,11 @@ function putReq (config, uploadToken, key, rsStream, rsStreamLen, putExtra, call
204203
totalBlockNum, putExtra, rsStreamLen, rsStream, callbackFunc);
205204
}
206205
} else {
207-
throw new Error("分片上传版本号错误")
206+
throw new Error("part upload version number error")
208207
}
209208
}
210209

211210
function mkblkReq (upDomain, uploadToken, blkData, callbackFunc) {
212-
// console.log("mkblk");
213211
var requestURI = upDomain + '/mkblk/' + blkData.length;
214212
var auth = 'UpToken ' + uploadToken;
215213
var headers = {
@@ -221,7 +219,6 @@ function mkblkReq (upDomain, uploadToken, blkData, callbackFunc) {
221219

222220
function mkfileReq (upDomain, uploadToken, fileSize, ctxList, key, putExtra,
223221
callbackFunc) {
224-
// console.log("mkfile");
225222
var requestURI = upDomain + '/mkfile/' + fileSize;
226223
if (key) {
227224
requestURI += '/key/' + util.urlsafeBase64Encode(key);

‎test/resume_up.test.js‎

Lines changed: 17 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -211,21 +211,17 @@ describe('test resume up', function () {
211211
});
212212
});
213213

214-
it('test resume up#putStream resume_v2_2m', function (done) {
214+
it('test resume up#putStream resume_v2', function (done) {
215215
config.zone = null;
216216

217-
var key = 'storage_putStream_resume_test_v2_2m' + Math.random(1000);
217+
var key = 'storage_putStream_resume_test_v2' + Math.random(1000);
218218
var stream = new Readable();
219219
var blkSize = 1024 * 1024;
220-
var blkCnt = 2;
221-
for (var i = 0; i < blkCnt; i++) {
222-
stream.push(crypto.randomBytes(blkSize));
223-
}
224-
stream.push(null);
220+
var blkCnt = [2, 4, 6, 10];
225221
var tmpfile = path.join(os.tmpdir(), '/resume_file');
226222
fs.writeFileSync(tmpfile, '');
227223
putExtra.resumeRecordFile = tmpfile;
228-
putExtra.partSize = 6 * 1024 * 1024
224+
putExtra.partSize = 4 * 1024 * 1024
229225
putExtra.version = 'v2'
230226
putExtra.progressCallback = function (len, total) {
231227
if (len === total) {
@@ -236,124 +232,22 @@ describe('test resume up', function () {
236232
});
237233
}
238234
};
239-
resumeUploader.putStream(uploadToken, key, stream, blkCnt * blkSize, putExtra,
240-
function (
241-
respErr,
242-
respBody, respInfo) {
243-
console.log(respBody, respInfo);
244-
should.not.exist(respErr);
245-
respBody.should.have.keys('key', 'hash');
246-
keysToDelete.push(respBody.key);
247-
});
248-
});
249-
250-
it('test resume up#putStream resume_v2_4m', function (done) {
251-
config.zone = null;
252-
253-
var key = 'storage_putStream_resume_test_v2_4m' + Math.random(1000);
254-
var stream = new Readable();
255-
var blkSize = 1024 * 1024;
256-
var blkCnt = 4;
257-
for (var i = 0; i < blkCnt; i++) {
258-
stream.push(crypto.randomBytes(blkSize));
259-
}
260-
stream.push(null);
261-
var tmpfile = path.join(os.tmpdir(), '/resume_file');
262-
fs.writeFileSync(tmpfile, '');
263-
putExtra.resumeRecordFile = tmpfile;
264-
putExtra.partSize = 6 * 1024 * 1024
265-
putExtra.version = 'v2'
266-
putExtra.progressCallback = function (len, total) {
267-
if (len === total) {
268-
var content = fs.readFileSync(tmpfile);
269-
var data = JSON.parse(content);
270-
data.etags.forEach(function (item) {
271-
item.should.have.keys('etag', 'partNumber');
272-
});
235+
for (var i = 0; i < blkCnt.length; i++) {
236+
for (var j = 0; j < blkCnt[i]; j++) {
237+
stream.push(crypto.randomBytes(blkSize));
273238
}
274-
};
275-
resumeUploader.putStream(uploadToken, key, stream, blkCnt * blkSize, putExtra,
276-
function (
277-
respErr,
278-
respBody, respInfo) {
279-
console.log(respBody, respInfo);
280-
should.not.exist(respErr);
281-
respBody.should.have.keys('key', 'hash');
282-
keysToDelete.push(respBody.key);
283-
});
284-
});
285-
286-
it('test resume up#putStream resume_v2_6m', function (done) {
287-
config.zone = null;
288-
289-
var key = 'storage_putStream_resume_test_v2_6m' + Math.random(1000);
290-
var stream = new Readable();
291-
var blkSize = 1024 * 1024;
292-
var blkCnt = 6;
293-
for (var i = 0; i < blkCnt; i++) {
294-
stream.push(crypto.randomBytes(blkSize));
295-
}
296-
stream.push(null);
297-
var tmpfile = path.join(os.tmpdir(), '/resume_file');
298-
fs.writeFileSync(tmpfile, '');
299-
putExtra.resumeRecordFile = tmpfile;
300-
putExtra.partSize = 6 * 1024 * 1024
301-
putExtra.version = 'v2'
302-
putExtra.progressCallback = function (len, total) {
303-
if (len === total) {
304-
var content = fs.readFileSync(tmpfile);
305-
var data = JSON.parse(content);
306-
data.etags.forEach(function (item) {
307-
item.should.have.keys('etag', 'partNumber');
239+
stream.push(null);
240+
resumeUploader.putStream(uploadToken, key, stream, blkCnt[i] * blkSize, putExtra,
241+
function (
242+
respErr,
243+
respBody, respInfo) {
244+
console.log(respBody, respInfo);
245+
should.not.exist(respErr);
246+
respBody.should.have.keys('key', 'hash');
247+
keysToDelete.push(respBody.key);
308248
});
309-
}
310-
};
311-
resumeUploader.putStream(uploadToken, key, stream, blkCnt * blkSize, putExtra,
312-
function (
313-
respErr,
314-
respBody, respInfo) {
315-
console.log(respBody, respInfo);
316-
should.not.exist(respErr);
317-
respBody.should.have.keys('key', 'hash');
318-
keysToDelete.push(respBody.key);
319-
});
320-
});
321-
322-
it('test resume up#putStream resume_v2_10m', function (done) {
323-
config.zone = null;
324-
325-
var key = 'storage_putStream_resume_test_v2_10m' + Math.random(1000);
326-
var stream = new Readable();
327-
var blkSize = 1024 * 1024;
328-
var blkCnt = 10;
329-
for (var i = 0; i < blkCnt; i++) {
330-
stream.push(crypto.randomBytes(blkSize));
331249
}
332-
stream.push(null);
333-
var tmpfile = path.join(os.tmpdir(), '/resume_file');
334-
fs.writeFileSync(tmpfile, '');
335-
putExtra.resumeRecordFile = tmpfile;
336-
putExtra.partSize = 6 * 1024 * 1024
337-
putExtra.version = 'v2'
338-
putExtra.progressCallback = function (len, total) {
339-
if (len === total) {
340-
var content = fs.readFileSync(tmpfile);
341-
var data = JSON.parse(content);
342-
data.etags.forEach(function (item) {
343-
item.should.have.keys('etag', 'partNumber');
344-
});
345-
}
346-
};
347-
resumeUploader.putStream(uploadToken, key, stream, blkCnt * blkSize, putExtra,
348-
function (
349-
respErr,
350-
respBody, respInfo) {
351-
console.log(respBody, respInfo);
352-
should.not.exist(respErr);
353-
respBody.should.have.keys('key', 'hash');
354-
keysToDelete.push(respBody.key);
355-
});
356-
});
357250

251+
});
358252
});
359253
});

0 commit comments

Comments
 (0)