Skip to content

Commit 6268fa3

Browse files
fengmk2fengmk2
committed
f
1 parent 2a7d8f7 commit 6268fa3

File tree

5 files changed

+37
-31
lines changed

5 files changed

+37
-31
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"eslint-config-egg": "13",
2929
"mm": "^3.2.1",
3030
"typescript": "^4.9.4",
31-
"urllib": "^3.27.1"
31+
"urllib": "4"
3232
},
3333
"engines": {
3434
"node": ">=16.0.0"

‎test/start.test.js‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ describe('test/start.test.js', () => {
5252

5353
await sleep(waitTime);
5454

55-
assert.equal(app.stderr, '');
55+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
5656
assert(app.stdout.match(/@@@ inject script/));
5757
assert(app.stdout.match(/@@@ inject script1/));
5858
assert(app.stdout.match(/@@@ inject script2/));
@@ -113,7 +113,7 @@ describe('test/start.test.js', () => {
113113

114114
await sleep(waitTime);
115115

116-
assert.equal(app.stderr, '');
116+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
117117
assert(!app.stdout.includes('DeprecationWarning:'));
118118
assert(app.stdout.includes('--title=egg-server-example'));
119119
assert(app.stdout.includes('"title":"egg-server-example"'));
@@ -148,7 +148,7 @@ describe('test/start.test.js', () => {
148148

149149
await sleep(waitTime);
150150

151-
assert.equal(app.stderr, '');
151+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
152152
assert(app.stdout.includes('READY!!!'));
153153
assert(app.stdout.includes('--title=egg-server-example'));
154154
assert(app.stdout.includes('"title":"egg-server-example"'));
@@ -201,7 +201,7 @@ describe('test/start.test.js', () => {
201201

202202
await sleep(waitTime);
203203

204-
assert.equal(app.stderr, '');
204+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
205205
assert(app.stdout.match(/custom-framework started on http:\/\/127\.0\.0\.1:7001/));
206206
const result = await httpclient.request('http://127.0.0.1:7001');
207207
assert(result.data.toString() === 'hi, egg');
@@ -227,7 +227,7 @@ describe('test/start.test.js', () => {
227227

228228
await sleep(waitTime);
229229

230-
assert.equal(app.stderr, '');
230+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
231231
assert(app.stdout.match(/custom-framework started on http:\/\/127\.0\.0\.1:7001/));
232232
const result = await httpclient.request('http://127.0.0.1:7001');
233233
assert(result.data.toString() === 'hi, egg');
@@ -253,7 +253,7 @@ describe('test/start.test.js', () => {
253253

254254
await sleep(waitTime);
255255

256-
assert.equal(app.stderr, '');
256+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
257257
assert(app.stdout.match(/yadan started on http:\/\/127\.0\.0\.1:7001/));
258258
const result = await httpclient.request('http://127.0.0.1:7001');
259259
assert(result.data.toString() === 'hi, yadan');
@@ -279,7 +279,7 @@ describe('test/start.test.js', () => {
279279

280280
await sleep(waitTime);
281281

282-
assert.equal(app.stderr, '');
282+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
283283
assert(app.stdout.includes('--title=egg-test'));
284284
assert(app.stdout.includes('"title":"egg-test"'));
285285
assert(app.stdout.match(/custom-framework started on http:\/\/127\.0\.0\.1:7001/));
@@ -309,7 +309,7 @@ describe('test/start.test.js', () => {
309309

310310
await sleep(waitTime);
311311

312-
assert.equal(app.stderr, '');
312+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
313313
assert(app.stdout.match(/custom-framework started on http:\/\/127\.0\.0\.1:7002/));
314314
const result = await httpclient.request('http://127.0.0.1:7002');
315315
assert(result.data.toString() === 'hi, egg');
@@ -335,7 +335,7 @@ describe('test/start.test.js', () => {
335335

336336
await sleep(waitTime);
337337

338-
assert.equal(app.stderr, '');
338+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
339339
assert(app.stdout.match(/custom-framework started on http:\/\/127\.0\.0\.1:7002/));
340340
const result = await httpclient.request('http://127.0.0.1:7002');
341341
assert(result.data.toString() === 'hi, egg');
@@ -361,7 +361,7 @@ describe('test/start.test.js', () => {
361361

362362
await sleep(waitTime);
363363

364-
assert.equal(app.stderr, '');
364+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
365365
assert(app.stdout.match(/custom-framework started on http:\/\/127\.0\.0\.1:7001/));
366366
const result = await httpclient.request('http://127.0.0.1:7001/env');
367367
assert(result.data.toString() === 'pre, true');
@@ -388,7 +388,7 @@ describe('test/start.test.js', () => {
388388

389389
await sleep(waitTime);
390390

391-
assert.equal(app.stderr, '');
391+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
392392
assert(app.stdout.includes('## EGG_SERVER_ENV is not pass'));
393393
assert(app.stdout.includes('## CUSTOM_ENV: pre'));
394394
assert(app.stdout.match(/custom-framework started on http:\/\/127\.0\.0\.1:7001/));
@@ -479,7 +479,7 @@ describe('test/start.test.js', () => {
479479

480480
await sleep(waitTime);
481481

482-
assert.equal(app.stderr, '');
482+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
483483
assert(app.stdout.match(/yadan started on http:\/\/127\.0\.0\.1:7001/));
484484
const result = await httpclient.request('http://127.0.0.1:7001');
485485
assert(result.data.toString() === 'hi, yadan');
@@ -503,7 +503,7 @@ describe('test/start.test.js', () => {
503503

504504
await sleep(waitTime);
505505

506-
assert.equal(app.stderr, '');
506+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
507507
assert(app.stdout.match(/yadan started on http:\/\/127\.0\.0\.1:7001/));
508508
const result = await httpclient.request('http://127.0.0.1:7001');
509509
assert(result.data.toString() === 'hi, yadan');
@@ -541,7 +541,7 @@ describe('test/start.test.js', () => {
541541

542542
await sleep(waitTime);
543543

544-
assert.equal(app.stderr, '');
544+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
545545
assert(app.stdout.match(/egg started on http:\/\/127\.0\.0\.1:8000/));
546546
assert(!app.stdout.includes('app_worker#3:'));
547547
const result = await httpclient.request('http://127.0.0.1:8000');
@@ -570,13 +570,13 @@ describe('test/start.test.js', () => {
570570

571571
await sleep(waitTime);
572572

573-
assert.equal(app.stderr, '');
573+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
574574
assert(app.stdout.match(/maxHeaderSize: 20000/));
575575
});
576576
});
577577

578578
describe('read egg.revert', () => {
579-
if (version < 18) return;
579+
if (version < 18 || version > 20) return;
580580
if (isWin) return;
581581
let app;
582582
let fixturePath;
@@ -598,7 +598,7 @@ describe('test/start.test.js', () => {
598598

599599
await sleep(waitTime);
600600

601-
assert.equal(app.stderr, '');
601+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
602602
assert(app.stdout.match(/SECURITY WARNING: Reverting CVE-2023-46809: Marvin attack on PKCS#1 padding/));
603603
});
604604
});
@@ -624,7 +624,7 @@ describe('test/start.test.js', () => {
624624

625625
await sleep(waitTime);
626626

627-
assert.equal(app.stderr, '');
627+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
628628
assert(app.stdout.match(/egg started on http:\/\/127\.0\.0\.1:7001/));
629629
const result = await httpclient.request('http://127.0.0.1:7001');
630630
assert.equal(result.data.toString(), 'hi, egg');
@@ -656,7 +656,7 @@ describe('test/start.test.js', () => {
656656

657657
await sleep(waitTime);
658658

659-
assert.equal(app.stderr, '');
659+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
660660
assert(app.stdout.match(/egg started on http:\/\/127\.0\.0\.1:7002/));
661661
assert(!app.stdout.includes('app_worker#3:'));
662662
const result = await httpclient.request('http://127.0.0.1:7002');

‎test/stop.test.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ describe('test/stop.test.js', () => {
4040
app.expect('code', 0);
4141
await sleep(waitTime);
4242

43-
assert.equal(app.stderr, '');
43+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
4444
assert(app.stdout.match(/custom-framework started on http:\/\/127\.0\.0\.1:7001/));
4545
const result = await httpclient.request('http://127.0.0.1:7001');
4646
assert(result.data.toString() === 'hi, egg');
@@ -142,7 +142,7 @@ describe('test/stop.test.js', () => {
142142
app.expect('code', 0);
143143
await sleep(waitTime);
144144

145-
assert.equal(app.stderr, '');
145+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
146146
assert(app.stdout.match(/custom-framework started on http:\/\/127\.0\.0\.1:7001/));
147147
const result = await httpclient.request('http://127.0.0.1:7001');
148148
assert(result.data.toString() === 'hi, egg');
@@ -218,12 +218,12 @@ describe('test/stop.test.js', () => {
218218

219219
await sleep(waitTime);
220220

221-
assert.equal(app.stderr, '');
221+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
222222
assert(app.stdout.match(/custom-framework started on http:\/\/127\.0\.0\.1:7001/));
223223
const result = await httpclient.request('http://127.0.0.1:7001');
224224
assert(result.data.toString() === 'hi, egg');
225225

226-
assert(app2.stderr === '');
226+
assert.equal(utils.replaceWeakRefMessage(app2.stderr), '');
227227
assert(app2.stdout.match(/custom-framework started on http:\/\/127\.0\.0\.1:7002/));
228228
const result2 = await httpclient.request('http://127.0.0.1:7002');
229229
assert(result2.data.toString() === 'hi, egg');
@@ -280,7 +280,7 @@ describe('test/stop.test.js', () => {
280280

281281
await sleep(waitTime);
282282

283-
assert.equal(app.stderr, '');
283+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
284284
assert(app.stdout.match(/http:\/\/127\.0\.0\.1:7001/));
285285
const result = await httpclient.request('http://127.0.0.1:7001');
286286
assert(result.data.toString() === 'hi, egg');

‎test/ts.test.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ describe('test/ts.test.js', () => {
4545

4646
await sleep(waitTime);
4747

48-
assert.equal(app.stderr, '');
48+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
4949
assert(app.stdout.match(/egg started on http:\/\/127\.0\.0\.1:7001/));
5050
const result = await httpclient.request('http://127.0.0.1:7001', { dataType: 'json' });
5151
// console.log(result.data);
@@ -59,7 +59,7 @@ describe('test/ts.test.js', () => {
5959

6060
await sleep(waitTime);
6161

62-
assert.equal(app.stderr, '');
62+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
6363
assert(app.stdout.match(/egg started on http:\/\/127\.0\.0\.1:7001/));
6464
const result = await httpclient.request('http://127.0.0.1:7001', { dataType: 'json' });
6565
// console.log(result.data);
@@ -73,7 +73,7 @@ describe('test/ts.test.js', () => {
7373

7474
await sleep(waitTime);
7575

76-
assert.equal(app.stderr, '');
76+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
7777
assert(app.stdout.match(/egg started on http:\/\/127\.0\.0\.1:7001/));
7878
const result = await httpclient.request('http://127.0.0.1:7001', { dataType: 'json' });
7979
// console.log(result.data);
@@ -102,7 +102,7 @@ describe('test/ts.test.js', () => {
102102

103103
await sleep(waitTime);
104104

105-
assert.equal(app.stderr, '');
105+
assert.equal(utils.replaceWeakRefMessage(app.stderr), '');
106106
assert(app.stdout.match(/egg started on http:\/\/127\.0\.0\.1:7001/));
107107
const result = await httpclient.request('http://127.0.0.1:7001', { dataType: 'json' });
108108
// console.log(result.data);

‎test/utils.js‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
'use strict';
2-
31
const helper = require('../lib/helper');
42
const sleep = require('mz-modules/sleep');
53
const isWin = process.platform === 'win32';
@@ -39,3 +37,11 @@ exports.cleanup = async function(baseDir) {
3937
await sleep('5s');
4038
}
4139
};
40+
41+
exports.replaceWeakRefMessage = function(stderr) {
42+
// Using compatibility WeakRef and FinalizationRegistry\r\n
43+
if (stderr.includes('Using compatibility WeakRef and FinalizationRegistry')) {
44+
stderr = stderr.replace(/Using compatibility WeakRef and FinalizationRegistry[\r\n]*/g, '');
45+
}
46+
return stderr;
47+
};

0 commit comments

Comments
 (0)