Skip to content

Commit 3717a05

Browse files
committed
修改bug
1 parent 1b98c3e commit 3717a05

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

test/resume_up.test.js

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ describe('test resume up', function () {
5959
var uploadToken = putPolicy.uploadToken(mac);
6060
config.zone = qiniu.zone.Zone_z0;
6161
var resumeUploader = new qiniu.resume_up.ResumeUploader(config);
62-
var putExtra = new qiniu.resume_up.PutExtra();
6362

6463
// eslint-disable-next-line no-undef
6564
describe('test resume up#putFileWithoutKey', function () {
6665
// eslint-disable-next-line no-undef
6766
it('test resume up#putFileWithoutKey', function (done) {
67+
var putExtra = new qiniu.resume_up.PutExtra();
6868
resumeUploader.putFileWithoutKey(uploadToken, imageFile,
6969
putExtra,
7070
function (
@@ -73,13 +73,13 @@ describe('test resume up', function () {
7373
console.log(respBody, respInfo);
7474
should.not.exist(respErr);
7575
respBody.should.have.keys('key', 'hash');
76-
console.log(respBody.key)
77-
keysToDelete.push("1",respBody.key);
76+
keysToDelete.push(respBody.key);
7877
done();
7978
});
8079
});
8180

8281
it('test resume up#putFileWithoutKey_v2', function (done) {
82+
var putExtra = new qiniu.resume_up.PutExtra();
8383
putExtra.partSize = 6 * 1024 * 1024
8484
putExtra.version = 'v2'
8585
resumeUploader.putFileWithoutKey(uploadToken, imageFile,
@@ -90,8 +90,9 @@ describe('test resume up', function () {
9090
console.log(respBody, respInfo);
9191
should.not.exist(respErr);
9292
respBody.should.have.keys('key', 'hash');
93-
console.log("2",respBody.key)
94-
keysToDelete.push(respBody.key);
93+
if (keysToDelete.indexOf(respBody.key) === -1) {
94+
keysToDelete.push(respBody.key);
95+
}
9596
done();
9697
});
9798
});
@@ -102,6 +103,7 @@ describe('test resume up', function () {
102103
describe('test resume up#putFile', function () {
103104
// eslint-disable-next-line no-undef
104105
it('test resume up#putFile', function (done) {
106+
var putExtra = new qiniu.resume_up.PutExtra();
105107
var key = 'storage_putFile_test' + Math.random(1000);
106108
resumeUploader.putFile(uploadToken, key, imageFile, putExtra,
107109
function (
@@ -116,6 +118,7 @@ describe('test resume up', function () {
116118
});
117119

118120
it('test resume up#putFile_v2', function (done) {
121+
var putExtra = new qiniu.resume_up.PutExtra();
119122
var key = 'storage_putFile_test_v2' + Math.random(1000);
120123
putExtra.partSize = 6 * 1024 * 1024
121124
putExtra.version = 'v2'
@@ -136,6 +139,7 @@ describe('test resume up', function () {
136139
// eslint-disable-next-line no-undef
137140
this.timeout(0)
138141
it('test resume up#putStream', function (done) {
142+
var putExtra = new qiniu.resume_up.PutExtra();
139143
var key = 'storage_putStream_test' + Math.random(1000);
140144
var stream = new Readable();
141145
var blkSize = 1024 * 1024;
@@ -155,6 +159,7 @@ describe('test resume up', function () {
155159
});
156160

157161
it('test resume up#putStream_v2', function (done) {
162+
var putExtra = new qiniu.resume_up.PutExtra();
158163
var key = 'storage_putStream_test_v2' + Math.random(1000);
159164
var stream = new Readable();
160165
var blkSize = 1024 * 1024;
@@ -181,6 +186,7 @@ describe('test resume up', function () {
181186
describe('test resume up#putStream resume', function () {
182187
this.timeout(0)
183188
it('test resume up#putStream resume', function (done) {
189+
var putExtra = new qiniu.resume_up.PutExtra();
184190
config.zone = null;
185191
var key = 'storage_putStream_resume_test' + Math.random(1000);
186192
var stream = new Readable();
@@ -193,7 +199,6 @@ describe('test resume up', function () {
193199
var tmpfile = path.join(os.tmpdir(), '/resume_file');
194200
fs.writeFileSync(tmpfile, '');
195201
putExtra.resumeRecordFile = tmpfile;
196-
putExtra.version = 'v1';
197202
putExtra.progressCallback = function (len, total) {
198203
if (len === total) {
199204
var content = fs.readFileSync(tmpfile);
@@ -216,7 +221,9 @@ describe('test resume up', function () {
216221
});
217222

218223
it('test resume up#putStream resume_v2', function (done) {
224+
var putExtra = new qiniu.resume_up.PutExtra();
219225
config.zone = null;
226+
var num = 0;
220227
var blkSize = 1024 * 1024;
221228
var blkCnt = [2,4,4.1,6,10];
222229
var tmpfile = path.join(os.tmpdir(), '/resume_file');
@@ -251,9 +258,12 @@ describe('test resume up', function () {
251258
should.not.exist(respErr);
252259
respBody.should.have.keys('key', 'hash');
253260
keysToDelete.push(respBody.key);
261+
num ++;
262+
if (num === blkCnt.length) {
263+
done();
264+
}
254265
});
255266
});
256-
done();
257267
});
258268
})
259269
});

0 commit comments

Comments
 (0)