[Pkg-javascript-commits] [node-tap] 174/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 8510900356243db4b5829ec506ddcb6b6b53ffd4
Merge: ceb42ea cae0cc1
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Dec 1 16:52:56 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 .../0012-Disable-test-for-disabled-feature.patch   | 74 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 test/run.js                                        | 13 ++--
 4 files changed, 85 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index 2dcfaf5,0000000..90658d9
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
- 13cf26473747acdd3c559245e3e232929b22a2c0
- 13cf26473747acdd3c559245e3e232929b22a2c0
++cae0cc1addf7a5541b2d99e99d77515059618f18
++cae0cc1addf7a5541b2d99e99d77515059618f18
 +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/0012-Disable-test-for-disabled-feature.patch
index 0000000,0000000..5172856
new file mode 100644
--- /dev/null
+++ b/debian/patches/0012-Disable-test-for-disabled-feature.patch
@@@ -1,0 -1,0 +1,74 @@@
++From cae0cc1addf7a5541b2d99e99d77515059618f18 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:52:33 +0100
++Subject: Disable test for disabled feature
++
++Forwarded: no
++---
++ test/run.js | 13 ++++++++-----
++ 1 file changed, 8 insertions(+), 5 deletions(-)
++
++diff --git a/test/run.js b/test/run.js
++index 7b0a002..a817dcb 100644
++--- a/test/run.js
+++++ b/test/run.js
++@@ -69,13 +69,14 @@ t.test('usage and other basics', t => {
++       t.end()
++     })
++   })
+++  /*
++   t.test('--nyc-help', t => {
++     run(['--nyc-help'], null, (er, o, e) => {
++       t.equal(er, null)
++       t.match(o, /\nOptions:\n/)
++       t.end()
++     })
++-  })
+++  })*/
++   t.test('--version', t => {
++     run(['--version'], null, (er, o, e) => {
++       t.equal(er, null)
++@@ -83,13 +84,14 @@ t.test('usage and other basics', t => {
++       t.end()
++     })
++   })
+++  /*
++   t.test('--nyc-version', t => {
++     run(['--nyc-version'], null, (er, o, e) => {
++       t.equal(er, null)
++       t.equal(o.trim(), require('nyc/package.json').version)
++       t.end()
++     })
++-  })
+++  })*/
++   t.end()
++ })
++ 
++@@ -318,7 +320,7 @@ t.test('unknown arg throws', t => {
++     t.end()
++   })
++ })
++-
+++/*
++ t.test('coverage', t => {
++   const cwd = process.cwd()
++   process.chdir(dir)
++@@ -409,7 +411,8 @@ t.test('coverage', t => {
++ 
++   t.end()
++ })
++-
+++*/
+++/*
++ t.test('save file', t => {
++   const xy1 = tmpfile(t, 'x/y/1.js', `'use strict'
++     const t = require(${tap})
++@@ -483,7 +486,7 @@ t.test('save file', t => {
++ 
++   t.end()
++ })
++-
+++*/
++ t.test('parallel', t => {
++   // should see start, start, end, end, in the output
++   tmpfile(t, 'p/y/1.js', `'use strict'
diff --cc debian/patches/series
index 2811c46,0000000..061119e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,11 -1,0 +1,12 @@@
 +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

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