Skip to content

Commit 1b94260

Browse files
isaacsisaacs
committedJul 23, 2021
tap@15
·
v7.4.3v6.1.1
1 parent 259e649 commit 1b94260

11 files changed

+2711
-2455
lines changed
 

‎package-lock.json

+2,632-2,347
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"events-to-array": "^1.1.2",
3939
"mutate-fs": "^2.1.1",
4040
"rimraf": "^2.7.1",
41-
"tap": "^14.9.2",
41+
"tap": "^15.0.9",
4242
"tar-fs": "^1.16.3",
4343
"tar-stream": "^1.6.2"
4444
},

‎test/create.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,15 @@ t.test('create file', t => {
131131
})
132132

133133
t.test('create', t => {
134-
t.isa(c({ sync: true }, ['README.md']), Pack.Sync)
135-
t.isa(c(['README.md']), Pack)
134+
t.type(c({ sync: true }, ['README.md']), Pack.Sync)
135+
t.type(c(['README.md']), Pack)
136136
t.end()
137137
})
138138

139139
t.test('open fails', t => {
140140
const poop = new Error('poop')
141141
const file = path.resolve(dir, 'throw-open.tar')
142-
t.tearDown(mutateFS.statFail(poop))
142+
t.teardown(mutateFS.statFail(poop))
143143
t.throws(_ => c({
144144
file: file,
145145
sync: true,

‎test/extract.js

+7-11
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ t.test('basic extracting', t => {
1616
const file = path.resolve(tars, 'utf8.tar')
1717
const dir = path.resolve(extractdir, 'basic')
1818

19-
t.beforeEach(cb => {
19+
t.beforeEach(() => {
2020
rimraf.sync(dir)
2121
mkdirp.sync(dir)
22-
cb()
2322
})
2423

2524
const check = t => {
@@ -59,10 +58,9 @@ t.test('file list and filter', t => {
5958
const file = path.resolve(tars, 'utf8.tar')
6059
const dir = path.resolve(extractdir, 'filter')
6160

62-
t.beforeEach(cb => {
61+
t.beforeEach(() => {
6362
rimraf.sync(dir)
6463
mkdirp.sync(dir)
65-
cb()
6664
})
6765

6866
const check = t => {
@@ -103,10 +101,9 @@ t.test('no file list', t => {
103101
const file = path.resolve(tars, 'body-byte-counts.tar')
104102
const dir = path.resolve(extractdir, 'no-list')
105103

106-
t.beforeEach(cb => {
104+
t.beforeEach(() => {
107105
rimraf.sync(dir)
108106
mkdirp.sync(dir)
109-
cb()
110107
})
111108

112109
const check = t => {
@@ -145,10 +142,9 @@ t.test('read in itty bits', t => {
145142
const file = path.resolve(tars, 'body-byte-counts.tar')
146143
const dir = path.resolve(extractdir, 'no-list')
147144

148-
t.beforeEach(cb => {
145+
t.beforeEach(() => {
149146
rimraf.sync(dir)
150147
mkdirp.sync(dir)
151-
cb()
152148
})
153149

154150
const check = t => {
@@ -191,9 +187,9 @@ t.test('bad calls', t => {
191187

192188
t.test('no file', t => {
193189
const Unpack = require('../lib/unpack.js')
194-
t.isa(x(), Unpack)
195-
t.isa(x(['asdf']), Unpack)
196-
t.isa(x({sync: true}), Unpack.Sync)
190+
t.type(x(), Unpack)
191+
t.type(x(['asdf']), Unpack)
192+
t.type(x({sync: true}), Unpack.Sync)
197193
t.end()
198194
})
199195

‎test/pack.js

+8-9
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ t.test('portable pack a dir', t => {
198198

199199
t.test('use process cwd if cwd not specified', t => {
200200
const cwd = process.cwd()
201-
t.tearDown(_ => process.chdir(cwd))
201+
t.teardown(_ => process.chdir(cwd))
202202
process.chdir(files)
203203

204204
const out = []
@@ -368,7 +368,7 @@ t.test('add the same dir twice (exercise cache code)', t => {
368368
t.test('if gzip is truthy, make it an object', t => {
369369
const opt = { gzip: true }
370370
new Pack(opt)
371-
t.isa(opt.gzip, 'object')
371+
t.type(opt.gzip, 'object')
372372
t.end()
373373
})
374374

@@ -463,7 +463,7 @@ t.test('very deep gzip path, sync', t => {
463463
pack.resume()
464464

465465
const zipped = pack.read()
466-
t.isa(zipped, Buffer)
466+
t.type(zipped, Buffer)
467467
const data = zlib.unzipSync(zipped)
468468
const entries = []
469469
for (var i = 0; i < data.length; i += 512) {
@@ -536,7 +536,7 @@ t.test('write after end', t => {
536536
})
537537

538538
t.test('emit error when stat fail', t => {
539-
t.tearDown(mutateFS.statFail(new Error('xyz')))
539+
t.teardown(mutateFS.statFail(new Error('xyz')))
540540
t.throws(_ => new PackSync({ cwd: files }).add('one-byte.txt'),
541541
new Error('xyz'))
542542

@@ -547,7 +547,7 @@ t.test('emit error when stat fail', t => {
547547
})
548548

549549
t.test('readdir fail', t => {
550-
t.tearDown(mutateFS.fail('readdir', new Error('xyz')))
550+
t.teardown(mutateFS.fail('readdir', new Error('xyz')))
551551
t.throws(_ => new PackSync({ cwd: files }).add('dir'), new Error('xyz'))
552552

553553
new Pack({ cwd: files }).add('dir').on('error', e => {
@@ -678,7 +678,7 @@ t.test('ignores mid-queue', t => {
678678
const data = Buffer.concat(out)
679679
t.equal(data.slice(0, 100).toString().replace(/\0.*$/, ''), './')
680680
const file = data.slice(512, 612).toString().replace(/\0.*$/, '')
681-
t.notequal(files.indexOf(file), -1)
681+
t.not(files.indexOf(file), -1)
682682
t.end()
683683
})
684684

@@ -752,11 +752,10 @@ t.test('warnings', t => {
752752
t.test('no dir recurse', t => {
753753
const dir = path.resolve(fixtures, 'pack-no-dir-recurse')
754754
t.teardown(_ => rimraf.sync(dir))
755-
t.beforeEach(cb => {
755+
t.beforeEach(() => {
756756
rimraf.sync(dir)
757757
mkdirp.sync(dir + '/x')
758758
fs.writeFileSync(dir + '/x/y', 'y')
759-
cb()
760759
})
761760

762761
const check = (t, data) => {
@@ -1003,7 +1002,7 @@ t.test('padding works regardless of arite/add order', t =>
10031002
write({ before: true }),
10041003
write({ before: false }),
10051004
]).then(res =>
1006-
t.is(res[0], res[1], 'length is the same regardless of write/add order')))
1005+
t.equal(res[0], res[1], 'length is the same regardless of write/add order')))
10071006

10081007
t.test('prefix and subdirs', t => {
10091008
const dir = path.resolve(fixtures, 'pack-prefix-subdirs')

‎test/read-entry.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ t.test('meta entry', t => {
110110
t.throws(_ => entry.write(Buffer.alloc(1024)))
111111

112112
t.equal(actual, expect)
113-
t.like(entry, { meta: true, type: 'NextFileHasLongLinkpath' })
113+
t.match(entry, { meta: true, type: 'NextFileHasLongLinkpath' })
114114
t.end()
115115
})
116116

@@ -146,7 +146,7 @@ t.test('unknown entry type', t => {
146146
t.throws(_ => entry.write(Buffer.alloc(1024)))
147147

148148
t.equal(actual, expect)
149-
t.like(entry, { ignore: true })
149+
t.match(entry, { ignore: true })
150150
t.end()
151151
})
152152

‎test/replace.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const spawn = require('child_process').spawn
2525

2626
t.teardown(_ => rimraf.sync(dir))
2727

28-
const reset = cb => {
28+
const reset = () => {
2929
rimraf.sync(dir)
3030
mkdirp.sync(dir)
3131
const data = fs.readFileSync(tars + '/body-byte-counts.tar')
@@ -44,13 +44,11 @@ const reset = cb => {
4444
fs.writeFileSync(fileEmpty, Buffer.alloc(1024))
4545

4646
fs.writeFileSync(fileCompressed, zlib.gzipSync(data))
47-
48-
if (cb)
49-
cb()
5047
}
5148

5249
t.test('setup', t => {
53-
reset(t.end)
50+
reset()
51+
t.end()
5452
})
5553

5654
t.test('basic file add to archive (good or truncated)', t => {
@@ -305,8 +303,8 @@ t.test('mtime cache', t => {
305303
t.test('create tarball out of another tarball', t => {
306304
const out = path.resolve(dir, 'out.tar')
307305

308-
t.beforeEach(cb => {
309-
fs.writeFile(out, fs.readFileSync(path.resolve(tars, 'dir.tar')), cb)
306+
t.beforeEach(() => {
307+
fs.writeFileSync(out, fs.readFileSync(path.resolve(tars, 'dir.tar')))
310308
})
311309

312310
const check = t => {

‎test/unpack.js

+40-59
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,11 @@ t.test('basic file unpack tests', t => {
7979
const tf = path.resolve(tars, tarfile)
8080
const dir = path.resolve(basedir, tarfile)
8181
const linkdir = path.resolve(basedir, tarfile + '.link')
82-
t.beforeEach(cb => {
82+
t.beforeEach(() => {
8383
rimraf.sync(dir)
8484
rimraf.sync(linkdir)
8585
mkdirp.sync(dir)
8686
fs.symlinkSync(dir, linkdir)
87-
cb()
8887
})
8988

9089
const check = t => {
@@ -144,8 +143,8 @@ t.test('links!', t => {
144143
const stripData = fs.readFileSync(tars + '/links-strip.tar')
145144

146145
t.plan(6)
147-
t.beforeEach(cb => mkdirp(dir).then(() => cb(), cb))
148-
t.afterEach(cb => rimraf(dir, cb))
146+
t.beforeEach(() => mkdirp.sync(dir))
147+
t.afterEach(() => rimraf.sync(dir))
149148

150149
const check = t => {
151150
const hl1 = fs.lstatSync(dir + '/hardlink-1')
@@ -241,14 +240,13 @@ t.test('links without cleanup (exercise clobbering code)', t => {
241240
mkdirp.sync(dir)
242241
t.teardown(_ => rimraf.sync(dir))
243242

244-
t.beforeEach(cb => {
243+
t.beforeEach(() => {
245244
// clobber this junk
246245
try {
247246
mkdirp.sync(dir + '/hardlink-1')
248247
mkdirp.sync(dir + '/hardlink-2')
249248
fs.writeFileSync(dir + '/symlink', 'not a symlink')
250249
} catch (er) {}
251-
cb()
252250
})
253251

254252
const check = t => {
@@ -341,10 +339,9 @@ t.test('symlink in dir path', t => {
341339
const dir = path.resolve(unpackdir, 'symlink-junk')
342340

343341
t.teardown(_ => rimraf.sync(dir))
344-
t.beforeEach(cb => {
342+
t.beforeEach(() => {
345343
rimraf.sync(dir)
346344
mkdirp.sync(dir)
347-
cb()
348345
})
349346

350347
const data = makeTar([
@@ -488,7 +485,7 @@ t.test('symlink in dir path', t => {
488485
t.same(warnings, [])
489486
t.equal(fs.lstatSync(dir + '/d/i/r/dir').mode & 0o7777, 0o751)
490487
t.ok(fs.lstatSync(dir + '/d/i/r/file').isFile(), 'got file')
491-
t.notok(fs.lstatSync(dir + '/d/i/r/symlink').isSymbolicLink(), 'no link')
488+
t.notOk(fs.lstatSync(dir + '/d/i/r/symlink').isSymbolicLink(), 'no link')
492489
t.ok(fs.lstatSync(dir + '/d/i/r/symlink').isDirectory(), 'sym is dir')
493490
t.ok(fs.lstatSync(dir + '/d/i/r/symlink/x').isFile(), 'x thru link')
494491
t.end()
@@ -522,7 +519,7 @@ t.test('symlink in dir path', t => {
522519
u.end(data)
523520
t.equal(fs.lstatSync(dir + '/d/i/r/dir').mode & 0o7777, 0o751)
524521
t.ok(fs.lstatSync(dir + '/d/i/r/file').isFile(), 'got file')
525-
t.notok(fs.lstatSync(dir + '/d/i/r/symlink').isSymbolicLink(), 'no link')
522+
t.notOk(fs.lstatSync(dir + '/d/i/r/symlink').isSymbolicLink(), 'no link')
526523
t.ok(fs.lstatSync(dir + '/d/i/r/symlink').isDirectory(), 'sym is dir')
527524
t.ok(fs.lstatSync(dir + '/d/i/r/symlink/x').isFile(), 'x thru link')
528525
t.end()
@@ -676,10 +673,9 @@ t.test('file in dir path', t => {
676673
const dir = path.resolve(unpackdir, 'file-junk')
677674

678675
t.teardown(_ => rimraf.sync(dir))
679-
t.beforeEach(cb => {
676+
t.beforeEach(() => {
680677
rimraf.sync(dir)
681678
mkdirp.sync(dir)
682-
cb()
683679
})
684680

685681
const data = makeTar([
@@ -749,7 +745,7 @@ t.test('file in dir path', t => {
749745
t.test('set umask option', t => {
750746
const dir = path.resolve(unpackdir, 'umask')
751747
mkdirp.sync(dir)
752-
t.tearDown(_ => rimraf.sync(dir))
748+
t.teardown(_ => rimraf.sync(dir))
753749

754750
const data = makeTar([
755751
{
@@ -774,10 +770,9 @@ t.test('set umask option', t => {
774770
t.test('absolute paths', t => {
775771
const dir = path.join(unpackdir, 'absolute-paths')
776772
t.teardown(_ => rimraf.sync(dir))
777-
t.beforeEach(cb => {
773+
t.beforeEach(() => {
778774
rimraf.sync(dir)
779775
mkdirp.sync(dir)
780-
cb()
781776
})
782777

783778
const absolute = path.resolve(dir, 'd/i/r/absolute')
@@ -869,10 +864,9 @@ t.test('absolute paths', t => {
869864
t.test('.. paths', t => {
870865
const dir = path.join(unpackdir, 'dotted-paths')
871866
t.teardown(_ => rimraf.sync(dir))
872-
t.beforeEach(cb => {
867+
t.beforeEach(() => {
873868
rimraf.sync(dir)
874869
mkdirp.sync(dir)
875-
cb()
876870
})
877871

878872
const fmode = 0o755
@@ -971,16 +965,14 @@ t.test('fail all stats', t => {
971965
const dir = path.join(unpackdir, 'stat-fail')
972966

973967
const warnings = []
974-
t.beforeEach(cb => {
968+
t.beforeEach(() => {
975969
warnings.length = 0
976970
mkdirp.sync(dir)
977971
unmutate = mutateFS.statFail(poop)
978-
cb()
979972
})
980-
t.afterEach(cb => {
973+
t.afterEach(() => {
981974
unmutate()
982975
rimraf.sync(dir)
983-
cb()
984976
})
985977

986978
const data = makeTar([
@@ -1082,11 +1074,10 @@ t.test('fail symlink', t => {
10821074
t.teardown(_ => (unmutate(), rimraf.sync(dir)))
10831075

10841076
const warnings = []
1085-
t.beforeEach(cb => {
1077+
t.beforeEach(() => {
10861078
warnings.length = 0
10871079
rimraf.sync(dir)
10881080
mkdirp.sync(dir)
1089-
cb()
10901081
})
10911082

10921083
const data = makeTar([
@@ -1144,11 +1135,10 @@ t.test('fail chmod', t => {
11441135
t.teardown(_ => (unmutate(), rimraf.sync(dir)))
11451136

11461137
const warnings = []
1147-
t.beforeEach(cb => {
1138+
t.beforeEach(() => {
11481139
warnings.length = 0
11491140
rimraf.sync(dir)
11501141
mkdirp.sync(dir)
1151-
cb()
11521142
})
11531143

11541144
const data = makeTar([
@@ -1205,17 +1195,13 @@ t.test('fail mkdir', t => {
12051195
t.teardown(_ => rimraf.sync(dir))
12061196

12071197
const warnings = []
1208-
t.beforeEach(cb => {
1198+
t.beforeEach(() => {
12091199
warnings.length = 0
12101200
rimraf.sync(dir)
12111201
mkdirp.sync(dir)
12121202
unmutate = mutateFS.fail('mkdir', poop)
1213-
cb()
1214-
})
1215-
t.afterEach(cb => {
1216-
unmutate()
1217-
cb()
12181203
})
1204+
t.afterEach(() => unmutate())
12191205

12201206
const data = makeTar([
12211207
{
@@ -1272,11 +1258,10 @@ t.test('fail write', t => {
12721258
t.teardown(_ => (unmutate(), rimraf.sync(dir)))
12731259

12741260
const warnings = []
1275-
t.beforeEach(cb => {
1261+
t.beforeEach(() => {
12761262
warnings.length = 0
12771263
rimraf.sync(dir)
12781264
mkdirp.sync(dir)
1279-
cb()
12801265
})
12811266

12821267
const data = makeTar([
@@ -1323,12 +1308,11 @@ t.test('skip existing', t => {
13231308
t.teardown(_ => rimraf.sync(dir))
13241309

13251310
const date = new Date('2011-03-27T22:16:31.000Z')
1326-
t.beforeEach(cb => {
1311+
t.beforeEach(() => {
13271312
rimraf.sync(dir)
13281313
mkdirp.sync(dir)
13291314
fs.writeFileSync(dir + '/x', 'y')
13301315
fs.utimesSync(dir + '/x', date, date)
1331-
cb()
13321316
})
13331317

13341318
const data = makeTar([
@@ -1376,12 +1360,11 @@ t.test('skip newer', t => {
13761360
t.teardown(_ => rimraf.sync(dir))
13771361

13781362
const date = new Date('2013-12-19T17:00:00.000Z')
1379-
t.beforeEach(cb => {
1363+
t.beforeEach(() => {
13801364
rimraf.sync(dir)
13811365
mkdirp.sync(dir)
13821366
fs.writeFileSync(dir + '/x', 'y')
13831367
fs.utimesSync(dir + '/x', date, date)
1384-
cb()
13851368
})
13861369

13871370
const data = makeTar([
@@ -1428,10 +1411,9 @@ t.test('no mtime', t => {
14281411
const dir = path.join(unpackdir, 'skip-newer')
14291412
t.teardown(_ => rimraf.sync(dir))
14301413

1431-
t.beforeEach(cb => {
1414+
t.beforeEach(() => {
14321415
rimraf.sync(dir)
14331416
mkdirp.sync(dir)
1434-
cb()
14351417
})
14361418

14371419
const date = new Date('2011-03-27T22:16:31.000Z')
@@ -1461,11 +1443,11 @@ t.test('no mtime', t => {
14611443
const check = t => {
14621444
// this may fail if it's run on March 27, 2011
14631445
const stx = fs.lstatSync(dir + '/x')
1464-
t.notEqual(stx.atime.toISOString(), date.toISOString())
1465-
t.notEqual(stx.mtime.toISOString(), date.toISOString())
1446+
t.not(stx.atime.toISOString(), date.toISOString())
1447+
t.not(stx.mtime.toISOString(), date.toISOString())
14661448
const sty = fs.lstatSync(dir + '/x/y')
1467-
t.notEqual(sty.atime.toISOString(), date.toISOString())
1468-
t.notEqual(sty.mtime.toISOString(), date.toISOString())
1449+
t.not(sty.atime.toISOString(), date.toISOString())
1450+
t.not(sty.mtime.toISOString(), date.toISOString())
14691451
const data = fs.readFileSync(dir + '/x/y', 'utf8')
14701452
t.equal(data, 'x')
14711453
t.end()
@@ -1492,7 +1474,7 @@ t.test('no mtime', t => {
14921474
t.test('unpack big enough to pause/drain', t => {
14931475
const dir = path.resolve(unpackdir, 'drain-clog')
14941476
mkdirp.sync(dir)
1495-
t.tearDown(_ => rimraf.sync(dir))
1477+
t.teardown(_ => rimraf.sync(dir))
14961478
const stream = fs.createReadStream(fixtures + '/parses.tar')
14971479
const u = new Unpack({
14981480
cwd: dir,
@@ -1723,20 +1705,20 @@ t.test('set owner', t => {
17231705
unl()
17241706
})
17251707

1726-
t.beforeEach(cb => mkdirp(dir).then(() => cb(), cb))
1727-
t.afterEach(cb => rimraf(dir, cb))
1708+
t.beforeEach(() => mkdirp.sync(dir))
1709+
t.afterEach(() => rimraf.sync(dir))
17281710

17291711
const check = t => {
17301712
const dirStat = fs.statSync(dir + '/foo')
1731-
t.notEqual(dirStat.uid, 2456124561)
1732-
t.notEqual(dirStat.gid, 813708013)
1713+
t.not(dirStat.uid, 2456124561)
1714+
t.not(dirStat.gid, 813708013)
17331715
const fileStat = fs.statSync(dir + '/foo/my-uid-different-gid')
1734-
t.notEqual(fileStat.uid, 2456124561)
1735-
t.notEqual(fileStat.gid, 813708013)
1716+
t.not(fileStat.uid, 2456124561)
1717+
t.not(fileStat.gid, 813708013)
17361718
const dirStat2 = fs.statSync(dir + '/foo/different-uid-nogid')
1737-
t.notEqual(dirStat2.uid, 2456124561)
1719+
t.not(dirStat2.uid, 2456124561)
17381720
const fileStat2 = fs.statSync(dir + '/foo/different-uid-nogid/bar')
1739-
t.notEqual(fileStat2.uid, 2456124561)
1721+
t.not(fileStat2.uid, 2456124561)
17401722
t.end()
17411723
}
17421724

@@ -1776,8 +1758,8 @@ t.test('unpack when dir is not writable', t => {
17761758
])
17771759

17781760
const dir = path.resolve(unpackdir, 'nowrite-dir')
1779-
t.beforeEach(cb => mkdirp(dir).then(() => cb(), cb))
1780-
t.afterEach(cb => rimraf(dir, cb))
1761+
t.beforeEach(() => mkdirp.sync(dir))
1762+
t.afterEach(() => rimraf.sync(dir))
17811763

17821764
const check = t => {
17831765
t.equal(fs.statSync(dir + '/a').mode & 0o7777, 0o744)
@@ -1813,8 +1795,8 @@ t.test('transmute chars on windows', t => {
18131795
])
18141796

18151797
const dir = path.resolve(unpackdir, 'winchars')
1816-
t.beforeEach(cb => mkdirp(dir).then(() => cb(), cb))
1817-
t.afterEach(cb => rimraf(dir, cb))
1798+
t.beforeEach(() => mkdirp.sync(dir))
1799+
t.afterEach(() => rimraf.sync(dir))
18181800

18191801
const hex = 'ef80bcef81bcef80beef80bfef80ba2e747874'
18201802
const uglyName = Buffer.from(hex, 'hex').toString()
@@ -2208,10 +2190,9 @@ t.test('transform', t => {
22082190
t.test(tarfile, t => {
22092191
const tf = path.resolve(tars, tarfile)
22102192
const dir = path.resolve(basedir, tarfile)
2211-
t.beforeEach(cb => {
2193+
t.beforeEach(() => {
22122194
rimraf.sync(dir)
22132195
mkdirp.sync(dir)
2214-
cb()
22152196
})
22162197

22172198
const check = t => {
@@ -2332,7 +2313,7 @@ t.test('futimes/fchown failures', t => {
23322313
const poop = new Error('poop')
23332314
const second = new Error('second error')
23342315

2335-
const reset = cb => {
2316+
const reset = () => {
23362317
rimraf.sync(dir)
23372318
mkdirp.sync(dir)
23382319
}

‎test/update.js

+4-7
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const spawn = require('child_process').spawn
2424

2525
t.teardown(_ => rimraf.sync(dir))
2626

27-
const reset = cb => {
27+
const reset = () => {
2828
rimraf.sync(dir)
2929
mkdirp.sync(dir)
3030
const data = fs.readFileSync(tars + '/body-byte-counts.tar')
@@ -43,13 +43,11 @@ const reset = cb => {
4343
fs.writeFileSync(fileEmpty, Buffer.alloc(1024))
4444

4545
fs.writeFileSync(fileCompressed, zlib.gzipSync(data))
46-
47-
if (cb)
48-
cb()
4946
}
5047

5148
t.test('setup', t => {
52-
reset(t.end)
49+
reset()
50+
t.end()
5351
})
5452

5553
t.test('basic file add to archive (good or truncated)', t => {
@@ -263,13 +261,12 @@ t.test('do not add older file', t => {
263261
})
264262

265263
t.test('do add newer file', t => {
266-
t.beforeEach(cb => {
264+
t.beforeEach(() => {
267265
reset()
268266
const f = dir + '/1024-bytes.txt'
269267
fs.writeFileSync(f, new Array(1025).join('.'))
270268
const newDate = new Date('2017-05-01T22:06:43.736Z')
271269
fs.utimesSync(f, newDate, newDate)
272-
cb()
273270
})
274271

275272
const check = t => {

‎test/warn-mixin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const Warner = warner(EE)
66

77
const w = new Warner()
88

9-
t.isa(w.warn, 'function')
9+
t.type(w.warn, 'function')
1010

1111
const warning = []
1212
w.once('warn', (code, msg, data) => warning.push(code, msg, data))

‎test/write-entry.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ t.test('zero-byte file', t => {
243243

244244
t.test('zero-byte file, but close fails', t => {
245245
const poop = new Error('poop')
246-
t.tearDown(mutateFS.fail('close', poop))
246+
t.teardown(mutateFS.fail('close', poop))
247247

248248
const ws = new WriteEntry('files/1024-bytes.txt', { cwd: fixtures })
249249

@@ -526,7 +526,7 @@ t.test('readlink fail', t => {
526526
path: __filename,
527527
}
528528
// pretend everything is a symbolic link, then read something that isn't
529-
t.tearDown(mutateFS.statType('SymbolicLink'))
529+
t.teardown(mutateFS.statType('SymbolicLink'))
530530
t.throws(_ => new WriteEntry.Sync('write-entry.js', { cwd: __dirname }),
531531
expect)
532532
new WriteEntry('write-entry.js', { cwd: __dirname }).on('error', er => {
@@ -536,7 +536,7 @@ t.test('readlink fail', t => {
536536
})
537537

538538
t.test('open fail', t => {
539-
t.tearDown(mutateFS.fail('open', new Error('pwn')))
539+
t.teardown(mutateFS.fail('open', new Error('pwn')))
540540
t.throws(_ => new WriteEntry.Sync('write-entry.js', { cwd: __dirname }),
541541
{ message: 'pwn' })
542542
new WriteEntry('write-entry.js', { cwd: __dirname }).on('error', er => {
@@ -552,7 +552,7 @@ t.test('read fail', t => {
552552
syscall: 'read',
553553
}
554554
// pretend everything is a symbolic link, then read something that isn't
555-
t.tearDown(mutateFS.statType('File'))
555+
t.teardown(mutateFS.statType('File'))
556556
t.throws(_ => new WriteEntry.Sync('fixtures', {
557557
cwd: __dirname,
558558
}), expect)
@@ -563,7 +563,7 @@ t.test('read fail', t => {
563563
})
564564

565565
t.test('read invalid EOF', t => {
566-
t.tearDown(mutateFS.mutate('read', (er, br) => [er, 0]))
566+
t.teardown(mutateFS.mutate('read', (er, br) => [er, 0]))
567567
const expect = {
568568
message: 'encountered unexpected EOF',
569569
path: __filename,
@@ -579,7 +579,7 @@ t.test('read invalid EOF', t => {
579579
})
580580

581581
t.test('read overflow expectation', t => {
582-
t.tearDown(mutateFS.statMutate((er, st) => {
582+
t.teardown(mutateFS.statMutate((er, st) => {
583583
if (st)
584584
st.size = 3
585585
}))
@@ -598,7 +598,7 @@ t.test('read overflow expectation', t => {
598598
})
599599

600600
t.test('short reads', t => {
601-
t.tearDown(mutateFS.zenoRead())
601+
t.teardown(mutateFS.zenoRead())
602602
const cases = {
603603
'1024-bytes.txt': new Array(1024).join('x') + '\n',
604604
'100-byte-filename-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc': new Array(101).join('c'),
@@ -677,7 +677,7 @@ t.test('win32 <|>? in paths', {
677677
})
678678

679679
t.test('uid doesnt match, dont set uname', t => {
680-
t.tearDown(mutateFS.statMutate((er, st) => {
680+
t.teardown(mutateFS.statMutate((er, st) => {
681681
if (st)
682682
st.uid -= 1
683683
}))

0 commit comments

Comments
 (0)
Please sign in to comment.