2020// USE OR OTHER DEALINGS IN THE SOFTWARE.
2121
2222'use strict';
23- require('../common');
23+ const common = require('../common');
2424const fixtures = require('../common/fixtures');
2525const assert = require('assert');
2626const execFile = require('child_process').execFile;
@@ -40,49 +40,43 @@ const normal = [depmod];
4040const noDep = ['--no-deprecation', depmod];
4141const traceDep = ['--trace-deprecation', depmod];
4242
43- execFile(node, normal, function(er, stdout, stderr) {
43+ execFile(node, normal, common.mustSucceed(( stdout, stderr) => {
4444 console.error('normal: show deprecation warning');
45- assert.strictEqual(er, null);
4645 assert.strictEqual(stdout, '');
4746 assert.match(stderr, /this function is deprecated/);
4847 console.log('normal ok');
49- });
48+ })) ;
5049
51- execFile(node, noDep, function(er, stdout, stderr) {
50+ execFile(node, noDep, common.mustSucceed(( stdout, stderr) => {
5251 console.error('--no-deprecation: silence deprecations');
53- assert.strictEqual(er, null);
5452 assert.strictEqual(stdout, '');
5553 assert.strictEqual(stderr.trim(), 'This is deprecated');
5654 console.log('silent ok');
57- });
55+ })) ;
5856
59- execFile(node, traceDep, function(er, stdout, stderr) {
57+ execFile(node, traceDep, common.mustSucceed(( stdout, stderr) => {
6058 console.error('--trace-deprecation: show stack');
61- assert.strictEqual(er, null);
6259 assert.strictEqual(stdout, '');
6360 const stack = stderr.trim().split('\n');
6461 // Just check the top and bottom.
6562 assert.match(stack[1], /this function is deprecated/);
6663 assert.match(stack[0], /This is deprecated/);
6764 console.log('trace ok');
68- });
65+ })) ;
6966
70- execFile(node, [depUserlandFunction], function(er, stdout, stderr) {
67+ execFile(node, [depUserlandFunction], common.mustSucceed(( stdout, stderr) => {
7168 console.error('normal: testing deprecated userland function');
72- assert.strictEqual(er, null);
7369 assert.strictEqual(stdout, '');
7470 assert.match(stderr, /deprecatedFunction is deprecated/);
7571 console.error('normal: ok');
76- });
72+ })) ;
7773
78- execFile(node, [depUserlandClass], function(er, stdout, stderr) {
79- assert.strictEqual(er, null);
74+ execFile(node, [depUserlandClass], common.mustSucceed((stdout, stderr) => {
8075 assert.strictEqual(stdout, '');
8176 assert.match(stderr, /deprecatedClass is deprecated/);
82- });
77+ })) ;
8378
84- execFile(node, [depUserlandSubClass], function(er, stdout, stderr) {
85- assert.strictEqual(er, null);
79+ execFile(node, [depUserlandSubClass], common.mustSucceed((stdout, stderr) => {
8680 assert.strictEqual(stdout, '');
8781 assert.match(stderr, /deprecatedClass is deprecated/);
88- });
82+ })) ;
0 commit comments