[Pkg-javascript-commits] [node-tap] 154/186: merge patched into master

Bastien Roucariès rouca at moszumanska.debian.org
Fri Dec 1 16:40:55 UTC 2017


This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-tap.

commit a2cda13e31c05dc01aa8b71a8351ed62c87e1d17
Merge: b4e7013 4cd1e5e
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Dec 1 16:35:57 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 debian/patches/0004-Do-not-use-osHomedir.patch     | 27 ++++++++++++-
 debian/patches/0005-Bluebird-is-not-required.patch | 47 ----------------------
 ...ch => 0005-Skip-test-related-to-coverage.patch} |  2 +-
 ...0006-Remove-test-that-fail-due-to-timing.patch} |  2 +-
 ...l.patch => 0007-Disable-a-test-that-fail.patch} |  2 +-
 ...ch.patch => 0008-Do-not-use-module-touch.patch} |  2 +-
 ...se-built-tap.patch => 0009-Use-built-tap.patch} |  2 +-
 ...patch => 0010-Disable-bluebird-for-stack.patch} |  6 +--
 ...e-minipass.patch => 0011-Remove-minipass.patch} |  6 +--
 debian/patches/series                              | 15 ++++---
 lib/stack.js                                       |  4 +-
 lib/test.js                                        |  1 +
 package.json                                       |  1 +
 test-legacy/test/before-after-each-promise.js      |  2 +-
 15 files changed, 50 insertions(+), 73 deletions(-)

diff --cc debian/.git-dpm
index c569c3a,0000000..c988ab1
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,16 -1,0 +1,16 @@@
 +# see git-dpm(1) from git-dpm package
- 8b79cd765e21117ba53c389bcbe38e0ddd3417c9
- 8b79cd765e21117ba53c389bcbe38e0ddd3417c9
++4cd1e5edc820704001d46f0c4eb4cf79b2d2aee0
++4cd1e5edc820704001d46f0c4eb4cf79b2d2aee0
 +4e308b15bb671b9b0aff67f3ac19957e4764a578
 +4e308b15bb671b9b0aff67f3ac19957e4764a578
 +node-tap_11.0.0+ds1.orig.tar.gz
 +a966e402d2576793be990eb4e19de6db3b2ff98c
 +142580
 +component:522a8693bbe5af81223646d1122b3c8c10d6c430:14390:node-tap_11.0.0+ds1.orig-module-bind-obj-methods.tar.gz
 +component:cf25554ca050dc49ae6656b41de42258989dcbce:1047:node-tap_11.0.0+ds1.orig-module-fs-exists-cached.tar.gz
 +component:696c8dcd7c39b57a271e7652f8155c4aca24f653:1813:node-tap_11.0.0+ds1.orig-module-function-loop.tar.gz
 +component:9ef920fc81e2e63cf59d41101258368cf4fca4fb:1571:node-tap_11.0.0+ds1.orig-module-own-or-env.tar.gz
 +component:4e877fbeda9a2ec8000fbc0bcae39645ee8bf8dc:1333:node-tap_11.0.0+ds1.orig-module-own-or.tar.gz
 +component:078874f788e3463819aababb8397ce021adbfa1a:1566:node-tap_11.0.0+ds1.orig-module-trivial-deferred.tar.gz
 +component:a200ae8bf612dae9e7aa5a81c69d43ab9dd1e5a8:14855:node-tap_11.0.0+ds1.orig-module-tsame.tar.gz
 +component:f693f29a315b50d9a9da2646a7a6645c96985b6a:1882:node-tap_11.0.0+ds1.orig-module-yapool.tar.gz
diff --cc debian/patches/0004-Do-not-use-osHomedir.patch
index 0f1b39e,0000000..71d9e6c
mode 100644,000000..100644
--- a/debian/patches/0004-Do-not-use-osHomedir.patch
+++ b/debian/patches/0004-Do-not-use-osHomedir.patch
@@@ -1,71 -1,0 +1,94 @@@
- From 4a8785054284387fac3d516a35d7752446c801ce Mon Sep 17 00:00:00 2001
++From 7f9cca93e7d997b99ca0e039400f3c2246b505c4 Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
 +Date: Sun, 10 Sep 2017 22:59:23 +0200
 +Subject: Do not use osHomedir
 +
 +Forwarded: no
 +---
 + bin/run.js             | 3 +--
++ lib/stack.js           | 4 ++--
 + package.json           | 1 -
 + test-legacy/rcfiles.js | 4 ++--
-  3 files changed, 3 insertions(+), 5 deletions(-)
++ 4 files changed, 5 insertions(+), 7 deletions(-)
 +
 +diff --git a/bin/run.js b/bin/run.js
 +index 9d950e5..862fdc8 100755
 +--- a/bin/run.js
 ++++ b/bin/run.js
 +@@ -15,7 +15,6 @@ return nycBin;
 + }
 + const glob = require('glob')
 + const isexe = require('isexe')
 +-const osHomedir = require('os-homedir')
 + const yaml = require('js-yaml')
 + const path = require('path')
 + const exists = require('fs-exists-cached').sync
 +@@ -66,7 +65,7 @@ const main = _ => {
 +   const defaults = constructDefaultArgs()
 + 
 +   // parse dotfile
 +-  const rcFile = process.env.TAP_RCFILE || (osHomedir() + '/.taprc')
 ++  const rcFile = process.env.TAP_RCFILE || (os.homedir() + '/.taprc')
 +   const rcOptions = parseRcFile(rcFile)
 + 
 +   // supplement defaults with parsed rc options
++diff --git a/lib/stack.js b/lib/stack.js
++index 5c8e511..c7665ba 100644
++--- a/lib/stack.js
+++++ b/lib/stack.js
++@@ -3,7 +3,7 @@ const sourceMapSupport = require('source-map-support')
++ const StackUtils = require('stack-utils')
++ const path = require('path')
++ const tapDir = path.resolve(__dirname, '..')
++-const osHomedir = require('os-homedir')
+++const osHomedir = require('os')
++ 
++ const resc = str =>
++   str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&')
++@@ -16,7 +16,7 @@ const skip = (process.cwd() !== tapDir ||
++   +process.env.TAP_DEV_LONGSTACK !== 1
++ ? [
++     /node_modules[\/\\]tap[\/\\]/,
++-    new RegExp(resc(path.resolve(osHomedir(), '.node-spawn-wrap-')) + '.*'),
+++    new RegExp(resc(path.resolve(os.Homedir(), '.node-spawn-wrap-')) + '.*'),
++     new RegExp(resc(tapDir) + '\\b', 'i'),
++     new RegExp(resc(require.resolve('function-loop'))),
++     new RegExp(resc(path.dirname(require.resolve('bluebird/package.json'))))
 +diff --git a/package.json b/package.json
 +index e2ec8ff..63e6df2 100644
 +--- a/package.json
 ++++ b/package.json
 +@@ -25,7 +25,6 @@
 +     "js-yaml": "^3.10.0",
 +     "minipass": "^2.2.1",
 +     "mkdirp": "^0.5.1",
 +-    "os-homedir": "^1.0.2",
 +     "own-or": "^1.0.0",
 +     "own-or-env": "^1.0.0",
 +     "rimraf": "^2.6.2",
 +diff --git a/test-legacy/rcfiles.js b/test-legacy/rcfiles.js
 +index 5696b23..bf8592e 100644
 +--- a/test-legacy/rcfiles.js
 ++++ b/test-legacy/rcfiles.js
 +@@ -3,11 +3,11 @@ var t = require('../')
 + var spawn = require('child_process').spawn
 + var node = process.execPath
 + var run = require.resolve('../bin/run.js')
 ++var os = require('os')
 + 
 + // fake this one in case you have some weird stuff in ~/.taprc
 + var path = require('path')
 + process.env.HOME = path.resolve(__dirname, 'fixtures')
 +-var osHomedir = require('os-homedir')
 + 
 + var defaults = {
 +   grep: [],
 +@@ -31,7 +31,7 @@ var defaults = {
 +   jobs: 1,
 +   lines: 0,
 +   statements: 0,
 +-  rcFile: osHomedir() + '/.taprc',
 ++  rcFile: os.homedir() + '/.taprc',
 +   outputFile: null
 + }
 + 
diff --cc debian/patches/0005-Skip-test-related-to-coverage.patch
index 28acc97,0000000..4f2a828
mode 100644,000000..100644
--- a/debian/patches/0005-Skip-test-related-to-coverage.patch
+++ b/debian/patches/0005-Skip-test-related-to-coverage.patch
@@@ -1,37 -1,0 +1,37 @@@
- From af30475da21a5d771c4ee6110c9955f79caa129d Mon Sep 17 00:00:00 2001
++From f49ba80c26d428c62e4a2c4520d65d2b27eb368f Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
 +Date: Mon, 11 Sep 2017 11:08:16 +0200
 +Subject: Skip test related to coverage
 +
 +Forwarded: no
 +---
 + test-legacy/coverage-export.js          | 2 ++
 + test-legacy/coverage-html-no-browser.js | 2 ++
 + 2 files changed, 4 insertions(+)
 +
 +diff --git a/test-legacy/coverage-export.js b/test-legacy/coverage-export.js
 +index c7b3e3c..4b5e90f 100644
 +--- a/test-legacy/coverage-export.js
 ++++ b/test-legacy/coverage-export.js
 +@@ -7,6 +7,8 @@ var run = require.resolve('../bin/run.js')
 + var ok = require.resolve('./test/ok.js')
 + var testRe = /COVERAGE_SERVICE_TEST/
 + 
 ++process.exit()
 ++
 + t.test('generate some coverage data', function (tt) {
 +   spawn(node, [run, ok, '--coverage'], {
 +     stdio: 'ignore'
 +diff --git a/test-legacy/coverage-html-no-browser.js b/test-legacy/coverage-html-no-browser.js
 +index 6f2d171..e24cf03 100644
 +--- a/test-legacy/coverage-html-no-browser.js
 ++++ b/test-legacy/coverage-html-no-browser.js
 +@@ -13,6 +13,8 @@ var rimraf = require('rimraf')
 + var dir = __dirname + '/coverage-html-no-browser'
 + var htmlfile = dir + '/coverage/lcov-report/bin/run.js.html'
 + 
 ++process.exit()
 ++
 + t.test('setup a working dir', function (t) {
 +   mkdirp.sync(dir)
 +   t.end()
diff --cc debian/patches/0006-Remove-test-that-fail-due-to-timing.patch
index 01b2fab,0000000..8b9dfad
mode 100644,000000..100644
--- a/debian/patches/0006-Remove-test-that-fail-due-to-timing.patch
+++ b/debian/patches/0006-Remove-test-that-fail-due-to-timing.patch
@@@ -1,24 -1,0 +1,24 @@@
- From 277f559768c0acb4686ce136df1002b1dd920037 Mon Sep 17 00:00:00 2001
++From d3be23f4468b6bfdae08d1fee6c3d99c1537cb84 Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
 +Date: Tue, 12 Sep 2017 11:50:38 +0200
 +Subject: Remove test that fail due to timing
 +
 +Forwarded: no
 +---
 + test-legacy/runner-epipe.js | 3 +++
 + 1 file changed, 3 insertions(+)
 +
 +diff --git a/test-legacy/runner-epipe.js b/test-legacy/runner-epipe.js
 +index 5e298ee..a023bae 100644
 +--- a/test-legacy/runner-epipe.js
 ++++ b/test-legacy/runner-epipe.js
 +@@ -10,6 +10,9 @@ if (process.version.match(/^0\.1[02]\./)) {
 +   process.exit()
 + }
 + 
 ++/* not suitable for buildd */
 ++process.exit()
 ++
 + var cp = require('child_process')
 + var spawn = cp.spawn
 + var execFile = cp.execFile
diff --cc debian/patches/0007-Disable-a-test-that-fail.patch
index f195979,0000000..b9d7441
mode 100644,000000..100644
--- a/debian/patches/0007-Disable-a-test-that-fail.patch
+++ b/debian/patches/0007-Disable-a-test-that-fail.patch
@@@ -1,20 -1,0 +1,20 @@@
- From e07797f439c4730fba2d81513e17019b6c0589d1 Mon Sep 17 00:00:00 2001
++From 09eea1cc2e23155893141dddce01f638abed1b6f Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
 +Date: Tue, 12 Sep 2017 14:28:26 +0200
 +Subject: Disable a test that fail
 +
 +Forwarded: no
 +---
 + test-legacy/runner-path-globbing.js | 2 ++
 + 1 file changed, 2 insertions(+)
 +
 +diff --git a/test-legacy/runner-path-globbing.js b/test-legacy/runner-path-globbing.js
 +index c1f964c..de9b976 100644
 +--- a/test-legacy/runner-path-globbing.js
 ++++ b/test-legacy/runner-path-globbing.js
 +@@ -1,3 +1,5 @@
 ++process.exit()
 ++
 + var t = require('../')
 + var cp = require('child_process')
 + var spawn = cp.spawn
diff --cc debian/patches/0008-Do-not-use-module-touch.patch
index b094dae,0000000..c04a5d4
mode 100644,000000..100644
--- a/debian/patches/0008-Do-not-use-module-touch.patch
+++ b/debian/patches/0008-Do-not-use-module-touch.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 52cd0517ef74703c3dbcb3d92ad74c38561ce1ff Mon Sep 17 00:00:00 2001
++From ecb26b5edd58b00842b824843e5d291a2a62252f Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
 +Date: Tue, 12 Sep 2017 14:52:07 +0200
 +Subject: Do not use module touch
 +
 +Forwarded: no
 +---
 + module-fs-exists-cached/test.js | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/module-fs-exists-cached/test.js b/module-fs-exists-cached/test.js
 +index 99a1c48..9eb9461 100644
 +--- a/module-fs-exists-cached/test.js
 ++++ b/module-fs-exists-cached/test.js
 +@@ -1,6 +1,6 @@
 + var exists = require('./')
 + var t = require('tap')
 +-var touch = require('touch')
 ++var touch = { 'sync' : function (f) { var fs = require('fs') ;fs.closeSync(fs.openSync(f,'w')) ; } }
 + var rimraf = require('rimraf')
 + 
 + t.test('setup', function (t) {
diff --cc debian/patches/0009-Use-built-tap.patch
index a553c72,0000000..5db459a
mode 100644,000000..100644
--- a/debian/patches/0009-Use-built-tap.patch
+++ b/debian/patches/0009-Use-built-tap.patch
@@@ -1,166 -1,0 +1,166 @@@
- From c33f8038bc1d018fdc594619b55c4950cb489d59 Mon Sep 17 00:00:00 2001
++From 734d85d6219829680ee1dbc37e66632532176243 Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
 +Date: Tue, 12 Sep 2017 14:56:50 +0200
 +Subject: Use built tap
 +
 +Forwarded; no
 +---
 + module-bind-obj-methods/test.js                  | 2 +-
 + module-fs-exists-cached/test.js                  | 2 +-
 + module-function-loop/test.js                     | 2 +-
 + module-trivial-deferred/test.js                  | 2 +-
 + module-tsame/test/loose/basic.js                 | 2 +-
 + module-tsame/test/loose/buffer-native-equals.js  | 2 +-
 + module-tsame/test/loose/buffer-pure-js.js        | 2 +-
 + module-tsame/test/loose/set-map.js               | 2 +-
 + module-tsame/test/strict/basic.js                | 2 +-
 + module-tsame/test/strict/buffer-native-equals.js | 2 +-
 + module-tsame/test/strict/buffer-pure-js.js       | 2 +-
 + module-tsame/test/strict/set-map.js              | 2 +-
 + module-yapool/test.js                            | 2 +-
 + 13 files changed, 13 insertions(+), 13 deletions(-)
 +
 +diff --git a/module-bind-obj-methods/test.js b/module-bind-obj-methods/test.js
 +index f6af92a..51f8352 100644
 +--- a/module-bind-obj-methods/test.js
 ++++ b/module-bind-obj-methods/test.js
 +@@ -1,4 +1,4 @@
 +-const t = require('tap')
 ++const t = require('../')
 + var bindObj = require('./bind-obj-methods.js')
 + var obj, m
 + 
 +diff --git a/module-fs-exists-cached/test.js b/module-fs-exists-cached/test.js
 +index 9eb9461..ca0a62c 100644
 +--- a/module-fs-exists-cached/test.js
 ++++ b/module-fs-exists-cached/test.js
 +@@ -1,5 +1,5 @@
 + var exists = require('./')
 +-var t = require('tap')
 ++var t = require('../')
 + var touch = { 'sync' : function (f) { var fs = require('fs') ;fs.closeSync(fs.openSync(f,'w')) ; } }
 + var rimraf = require('rimraf')
 + 
 +diff --git a/module-function-loop/test.js b/module-function-loop/test.js
 +index 7297a40..c25d01d 100644
 +--- a/module-function-loop/test.js
 ++++ b/module-function-loop/test.js
 +@@ -1,4 +1,4 @@
 +-var t = require('tap')
 ++var t = require('../')
 + var loop = require('./')
 + var obj = {}
 + 
 +diff --git a/module-trivial-deferred/test.js b/module-trivial-deferred/test.js
 +index bc7b682..d37ab15 100644
 +--- a/module-trivial-deferred/test.js
 ++++ b/module-trivial-deferred/test.js
 +@@ -1,7 +1,7 @@
 + var Deferred = require('./')
 + var assert = require('assert')
 + var d = new Deferred()
 +-var t = require('tap')
 ++var t = require('../')
 + t.match(d, {
 +   resolve: Function,
 +   reject: Function,
 +diff --git a/module-tsame/test/loose/basic.js b/module-tsame/test/loose/basic.js
 +index c8a04d1..078cec2 100644
 +--- a/module-tsame/test/loose/basic.js
 ++++ b/module-tsame/test/loose/basic.js
 +@@ -1,4 +1,4 @@
 +-var tap = require('tap')
 ++var tap = require('../../..')
 + var test = tap.test
 + var same = require('../..')
 + 
 +diff --git a/module-tsame/test/loose/buffer-native-equals.js b/module-tsame/test/loose/buffer-native-equals.js
 +index 5d47b16..b9b53c3 100644
 +--- a/module-tsame/test/loose/buffer-native-equals.js
 ++++ b/module-tsame/test/loose/buffer-native-equals.js
 +@@ -1,4 +1,4 @@
 +-var tap = require('tap')
 ++var tap = require('../../..')
 + var test = tap.test
 + var same = require('../..')
 + 
 +diff --git a/module-tsame/test/loose/buffer-pure-js.js b/module-tsame/test/loose/buffer-pure-js.js
 +index 38ffdf2..a8ad2fd 100644
 +--- a/module-tsame/test/loose/buffer-pure-js.js
 ++++ b/module-tsame/test/loose/buffer-pure-js.js
 +@@ -1,4 +1,4 @@
 +-var tap = require('tap')
 ++var tap = require('../../..')
 + var test = tap.test
 + var same = require('../..')
 + 
 +diff --git a/module-tsame/test/loose/set-map.js b/module-tsame/test/loose/set-map.js
 +index c188642..636ff3a 100644
 +--- a/module-tsame/test/loose/set-map.js
 ++++ b/module-tsame/test/loose/set-map.js
 +@@ -1,6 +1,6 @@
 + 'use strict'
 + var tsame = require('../..')
 +-var t = require('tap')
 ++var t = require('../../..')
 + 
 + t.test('set', function (t) {
 +   var obj = { a: 1 }
 +diff --git a/module-tsame/test/strict/basic.js b/module-tsame/test/strict/basic.js
 +index f45592d..97de31a 100644
 +--- a/module-tsame/test/strict/basic.js
 ++++ b/module-tsame/test/strict/basic.js
 +@@ -1,7 +1,7 @@
 + 'use strict'
 + 
 + var EventEmitter = require('events').EventEmitter
 +-var test = require('tap').test
 ++var test = require('../../..').test
 + var d = require('../..').strict
 + 
 + function functionA (a) { return a }
 +diff --git a/module-tsame/test/strict/buffer-native-equals.js b/module-tsame/test/strict/buffer-native-equals.js
 +index 53403f8..f6023e4 100644
 +--- a/module-tsame/test/strict/buffer-native-equals.js
 ++++ b/module-tsame/test/strict/buffer-native-equals.js
 +@@ -1,4 +1,4 @@
 +-var tap = require('tap')
 ++var tap = require('../../..')
 + var test = tap.test
 + var same = require('../..').strict
 + 
 +diff --git a/module-tsame/test/strict/buffer-pure-js.js b/module-tsame/test/strict/buffer-pure-js.js
 +index 56cfde5..477903b 100644
 +--- a/module-tsame/test/strict/buffer-pure-js.js
 ++++ b/module-tsame/test/strict/buffer-pure-js.js
 +@@ -1,4 +1,4 @@
 +-var tap = require('tap')
 ++var tap = require('../../..')
 + var test = tap.test
 + var same = require('../..').strict
 + 
 +diff --git a/module-tsame/test/strict/set-map.js b/module-tsame/test/strict/set-map.js
 +index 212deb7..0a064e1 100644
 +--- a/module-tsame/test/strict/set-map.js
 ++++ b/module-tsame/test/strict/set-map.js
 +@@ -1,6 +1,6 @@
 + 'use strict'
 + var tsame = require('../..').strict
 +-var t = require('tap')
 ++var t = require('../../..')
 + 
 + t.test('set', function (t) {
 +   var obj = { a: 1 }
 +diff --git a/module-yapool/test.js b/module-yapool/test.js
 +index d644a46..b36e899 100644
 +--- a/module-yapool/test.js
 ++++ b/module-yapool/test.js
 +@@ -3,7 +3,7 @@ var P = require('./index.js')
 + var a = { a: 1 }
 + var b = { b: 1 }
 + 
 +-var t = require('tap')
 ++var t = require('../')
 + t.jobs = 64
 + process.env.TAP_BUFFER = 1
 + 
diff --cc debian/patches/0010-Disable-bluebird-for-stack.patch
index ef145b7,0000000..b0c63ff
mode 100644,000000..100644
--- a/debian/patches/0010-Disable-bluebird-for-stack.patch
+++ b/debian/patches/0010-Disable-bluebird-for-stack.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 4ddade94561408d4a05d33255fd26ab144ba949d Mon Sep 17 00:00:00 2001
++From 3fa4f06e5fddde84c6e9dd175a281de4b4de246f Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
 +Date: Tue, 12 Sep 2017 15:26:59 +0200
 +Subject: Disable bluebird for stack
 +
 +Forwarded: no
 +---
 + lib/stack.js | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/lib/stack.js b/lib/stack.js
- index 5c8e511..673ad45 100644
++index c7665ba..d738fda 100644
 +--- a/lib/stack.js
 ++++ b/lib/stack.js
 +@@ -19,7 +19,7 @@ const skip = (process.cwd() !== tapDir ||
-      new RegExp(resc(path.resolve(osHomedir(), '.node-spawn-wrap-')) + '.*'),
++     new RegExp(resc(path.resolve(os.Homedir(), '.node-spawn-wrap-')) + '.*'),
 +     new RegExp(resc(tapDir) + '\\b', 'i'),
 +     new RegExp(resc(require.resolve('function-loop'))),
 +-    new RegExp(resc(path.dirname(require.resolve('bluebird/package.json'))))
 ++//    new RegExp(resc(path.dirname(require.resolve('bluebird/package.json'))))
 +   ]
 + : []
 + 
diff --cc debian/patches/0011-Remove-minipass.patch
index 237eb11,0000000..df987c6
mode 100644,000000..100644
--- a/debian/patches/0011-Remove-minipass.patch
+++ b/debian/patches/0011-Remove-minipass.patch
@@@ -1,62 -1,0 +1,62 @@@
- From 8b79cd765e21117ba53c389bcbe38e0ddd3417c9 Mon Sep 17 00:00:00 2001
++From 4cd1e5edc820704001d46f0c4eb4cf79b2d2aee0 Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
 +Date: Fri, 1 Dec 2017 16:32:04 +0100
 +Subject: Remove minipass
 +
 +Forwarded: no
 +---
 + lib/base.js   | 2 +-
 + package.json  | 1 -
 + test/stdin.js | 2 +-
 + test/test.js  | 2 +-
 + 4 files changed, 3 insertions(+), 4 deletions(-)
 +
 +diff --git a/lib/base.js b/lib/base.js
 +index 8c32cb7..86cafb4 100644
 +--- a/lib/base.js
 ++++ b/lib/base.js
 +@@ -1,6 +1,6 @@
 + 'use strict'
 + 
 +-const MiniPass = require('minipass')
 ++const MiniPass = require('stream').PassThrough
 + 
 + const extraFromError = require('./extra-from-error.js')
 + const assert = require('assert')
 +diff --git a/package.json b/package.json
- index 82a7aab..50a5203 100644
++index 63e6df2..c470236 100644
 +--- a/package.json
 ++++ b/package.json
- @@ -22,7 +22,6 @@
++@@ -23,7 +23,6 @@
 +     "glob": "^7.0.0",
 +     "isexe": "^2.0.0",
 +     "js-yaml": "^3.10.0",
 +-    "minipass": "^2.2.1",
 +     "mkdirp": "^0.5.1",
 +     "own-or": "^1.0.0",
 +     "own-or-env": "^1.0.0",
 +diff --git a/test/stdin.js b/test/stdin.js
 +index c0d3ef7..16518af 100644
 +--- a/test/stdin.js
 ++++ b/test/stdin.js
 +@@ -1,6 +1,6 @@
 + const t = require('../')
 + const Stdin = require('../lib/stdin.js')
 +-const MP = require('minipass')
 ++const MP = require('stream').PassThrough
 + 
 + process.env.TAP_BAIL = ''
 + process.env.TAP_BUFFER = ''
 +diff --git a/test/test.js b/test/test.js
 +index 1be4f1f..b160171 100644
 +--- a/test/test.js
 ++++ b/test/test.js
 +@@ -6,7 +6,7 @@ const Test = t.Test
 + const util = require('util')
 + const assert = require('assert')
 + const EE = require('events').EventEmitter
 +-const MiniPass = require('minipass')
 ++const MiniPass = require('stream').PassThrough
 + 
 + // set this forcibly so it doesn't interfere with other tests.
 + process.env.TAP_DIAG = ''
diff --cc debian/patches/series
index 8030bde,0000000..a440890
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,12 -1,0 +1,11 @@@
 +0001-Opener-could-be-optional.patch
 +0002-Replace-color-support-by-supports-color.patch
 +0003-Render-nyc-optional.patch
 +0004-Do-not-use-osHomedir.patch
- 0005-Bluebird-is-not-required.patch
- 0006-Skip-test-related-to-coverage.patch
- 0007-Remove-test-that-fail-due-to-timing.patch
- 0008-Disable-a-test-that-fail.patch
- 0009-Do-not-use-module-touch.patch
- 0010-Use-built-tap.patch
- 0011-Disable-bluebird-for-stack.patch
- 0012-Remove-minipass.patch
++0005-Skip-test-related-to-coverage.patch
++0006-Remove-test-that-fail-due-to-timing.patch
++0007-Disable-a-test-that-fail.patch
++0008-Do-not-use-module-touch.patch
++0009-Use-built-tap.patch
++0010-Disable-bluebird-for-stack.patch
++0011-Remove-minipass.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-tap.git



More information about the Pkg-javascript-commits mailing list