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

Fri Dec 1 16:40:59 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 7b04286c8ec43482e6eb82fea763897248f63001
Merge: 8613d29 28e256f
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Dec 1 17:09:27 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0014-Skip-test-related-to-coverage.patch       | 37 ++++++++++++++++++++++
 debian/patches/0015-Bluebird-is-not-required.patch | 22 +++++++++++++
 debian/patches/series                              |  2 ++
 package.json                                       |  1 -
 test-legacy/coverage-export.js                     |  2 ++
 test-legacy/coverage-html-no-browser.js            |  2 ++
 7 files changed, 67 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 3c97dac,0000000..507f9bd
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
- 655eac1cc3c00012fe181b2c57987ce30d14c5e4
- 655eac1cc3c00012fe181b2c57987ce30d14c5e4
++28e256f844fabbddc40bcd16de89962940bc65a9
++28e256f844fabbddc40bcd16de89962940bc65a9
 +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/0014-Skip-test-related-to-coverage.patch
index 0000000,0000000..19ea417
new file mode 100644
--- /dev/null
+++ b/debian/patches/0014-Skip-test-related-to-coverage.patch
@@@ -1,0 -1,0 +1,37 @@@
++From e16aca4e15cd3775e4165c555a7d36e1d40151f4 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/0015-Bluebird-is-not-required.patch
index 0000000,0000000..10e0f78
new file mode 100644
--- /dev/null
+++ b/debian/patches/0015-Bluebird-is-not-required.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 28e256f844fabbddc40bcd16de89962940bc65a9 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 23:15:47 +0200
++Subject: Bluebird is not required
++
++Forwarded: no
++---
++ package.json | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/package.json b/package.json
++index 6c80859..0d37770 100644
++--- a/package.json
+++++ b/package.json
++@@ -13,7 +13,6 @@
++   },
++   "dependencies": {
++     "bind-obj-methods": "^1.0.0",
++-    "bluebird": "^3.5.1",
++     "clean-yaml-object": "^0.1.0",
++     "supports-color" : "^3",
++     "foreground-child": "^1.3.3",
diff --cc debian/patches/series
index f712bc7,0000000..e881c59
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,13 -1,0 +1,15 @@@
 +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

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

