[Pkg-javascript-commits] [node-tap] 176/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 881a4c7d603e159697f58679f7f61cbec6be1d6a
Merge: 8510900 b42407e
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Fri Dec 1 16:56:51 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0012-Disable-test-for-disabled-feature.patch   | 28 +++++++++++++++++++---
 test/test.js                                       |  3 ++-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 90658d9,0000000..f6d711c
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
- cae0cc1addf7a5541b2d99e99d77515059618f18
- cae0cc1addf7a5541b2d99e99d77515059618f18
++b42407e0ca7b8d0a718bbea7f1ac1dbafbd98e00
++b42407e0ca7b8d0a718bbea7f1ac1dbafbd98e00
 +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 5172856,0000000..f958529
mode 100644,000000..100644
--- a/debian/patches/0012-Disable-test-for-disabled-feature.patch
+++ b/debian/patches/0012-Disable-test-for-disabled-feature.patch
@@@ -1,74 -1,0 +1,96 @@@
- From cae0cc1addf7a5541b2d99e99d77515059618f18 Mon Sep 17 00:00:00 2001
++From b42407e0ca7b8d0a718bbea7f1ac1dbafbd98e00 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(-)
++ test/run.js  | 13 ++++++++-----
++ test/test.js |  3 ++-
++ 2 files changed, 10 insertions(+), 6 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 --git a/test/test.js b/test/test.js
++index b160171..4d2a1af 100644
++--- a/test/test.js
+++++ b/test/test.js
++@@ -179,6 +179,7 @@ t.test('short output checks', t => {
++     'child thrower': tt => tt.test('child test', tt =>
++       tt.threw(new Error('ok'))).then(tt.end),
++ 
+++    /*
++     'child end event thrower': tt => {
++       tt.test(tt => {
++         tt.plan(1)
++@@ -191,7 +192,7 @@ t.test('short output checks', t => {
++         tt.equal(3, 3)
++       })
++       tt.end()
++-    }
+++    }*/
++   }
++ 
++   const keys = Object.keys(cases)

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