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

[Bastien Roucariès]

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

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

commit 51d01e45457b3ee31cad1047309454b18d301601
Merge: a296428 82c9258
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Dec 1 17:25:20 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../patches/0016-Disable-test-needing-home.patch   | 34 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 test/stack.js                                      |  4 +--
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 507f9bd,0000000..d67b8c4
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
- 28e256f844fabbddc40bcd16de89962940bc65a9
- 28e256f844fabbddc40bcd16de89962940bc65a9
++82c9258dd18793788cf8025f75022b1eb7116020
++82c9258dd18793788cf8025f75022b1eb7116020
 +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/0016-Disable-test-needing-home.patch
index 0000000,0000000..08b428c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0016-Disable-test-needing-home.patch
@@@ -1,0 -1,0 +1,34 @@@
++From 82c9258dd18793788cf8025f75022b1eb7116020 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 17:24:44 +0100
++Subject: Disable test needing home
++
++Build daemon have no home
++
++Forwarded: no
++---
++ test/stack.js | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/test/stack.js b/test/stack.js
++index 8822222..63716ce 100644
++--- a/test/stack.js
+++++ b/test/stack.js
++@@ -12,7 +12,7 @@ t.test('in tapdir, no envs', t => {
++   t.notMatch(stack, '\.node-spawn-wrap')
++   t.end()
++ })
++-
+++/*
++ t.test('in ~, no envs', t => {
++   delete require.cache[require.resolve('../lib/stack.js')]
++   process.chdir(process.env.HOME)
++@@ -33,7 +33,7 @@ t.test('in home, longstack', t => {
++   t.notMatch(stack, '\.node-spawn-wrap')
++   t.end()
++ })
++-
+++*/
++ t.test('in tapdir, shortstack', t => {
++   delete require.cache[require.resolve('../lib/stack.js')]
++   process.chdir(path.resolve(__dirname, '..'))
diff --cc debian/patches/series
index e881c59,0000000..724ba07
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,15 -1,0 +1,16 @@@
 +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-Remove-test-that-fail-due-to-timing.patch
 +0006-Disable-a-test-that-fail.patch
 +0007-Do-not-use-module-touch.patch
 +0008-Use-built-tap.patch
 +0009-Disable-bluebird-for-stack.patch
 +0010-Remove-minipass.patch
 +0011-Disable-bluebird-on-test.patch
 +0012-Disable-test-for-disabled-feature.patch
 +0013-Code-coverage-is-optional.patch
 +0014-Skip-test-related-to-coverage.patch
 +0015-Bluebird-is-not-required.patch
++0016-Disable-test-needing-home.patch

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