[Pkg-javascript-commits] [node-log-driver] 48/49: 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-log-driver.

commit 8f0b394a70b271ddde72a6e718413139b741b11f
Merge: 7be3da5 4524abc
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Thu Feb 22 13:53:19 2018 +0100

    merge patched into master

 README.md                                          |  8 ++---
 debian/.git-dpm                                    |  6 ++--
 .../0001-Use-sinon-instead-of-sinon-restore.patch  |  4 +--
 debian/patches/0002-Fix-test-suite.patch           | 34 ----------------------
 ...ot-need-to-depends-on-coverage.io-service.patch | 22 --------------
 debian/patches/series                              |  2 --
 package.json                                       |  5 ++--
 test/index.js                                      |  1 -
 8 files changed, 10 insertions(+), 72 deletions(-)

diff --cc debian/.git-dpm
index 52d5e23,0000000..3db5b9e
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 3a3ed9ee990a9563c764d4835aab104cb40fbc26
- 3a3ed9ee990a9563c764d4835aab104cb40fbc26
- 3a631e9b033112a06e73f46796739ad5d43c37e2
++4524abc314b228a1353fc51cc44f21fb893b1c86
++4524abc314b228a1353fc51cc44f21fb893b1c86
++02cf31ca5c48c7bd6df6456f033f33332fe065ff
 +02cf31ca5c48c7bd6df6456f033f33332fe065ff
 +node-log-driver_1.2.7+git+20180219+bba1761737.orig.tar.xz
 +8e383f762fcae6b379ff7998047721089d1d3ed4
 +17216
diff --cc debian/patches/0001-Use-sinon-instead-of-sinon-restore.patch
index e958371,0000000..a97ccdb
mode 100644,000000..100644
--- a/debian/patches/0001-Use-sinon-instead-of-sinon-restore.patch
+++ b/debian/patches/0001-Use-sinon-instead-of-sinon-restore.patch
@@@ -1,37 -1,0 +1,37 @@@
- From 52b582eadcab70f2b8e6d7578317f256cfb45321 Mon Sep 17 00:00:00 2001
++From 4524abc314b228a1353fc51cc44f21fb893b1c86 Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
 +Date: Thu, 24 Aug 2017 22:27:30 +0200
 +Subject: Use sinon instead of sinon-restore
 +
 +Forwarded: no
 +---
 + test/index.js | 6 ++++--
 + 1 file changed, 4 insertions(+), 2 deletions(-)
 +
 +diff --git a/test/index.js b/test/index.js
- index 776b426..7b5f3de 100644
++index edc9825..456d371 100644
 +--- a/test/index.js
 ++++ b/test/index.js
 +@@ -1,10 +1,12 @@
 + var should = require('should');
 + var logger = require('../index');
 + var defaultLogger = require('../index').logger;
 +-var sinon = require('sinon-restore');
 ++var sinonbase = require('sinon');
 + var logged = "";
 + var oldConsoleLog = console.log;
 + 
 ++var sinon = sinonbase.sandbox.create();
 ++
 + /* NOTE: console.log is mocked in these tests, so any uses of it will be
 +  * appended to the variabled "logged".  This will include any calls you
 +  * make to console.log() for the purpose of debugging in these tests.
 +@@ -22,7 +24,7 @@ describe("logdriver", function(){
 +     });
 +   });
 +   afterEach(function(){
 +-    sinon.restoreAll();
 ++    sinon.reset();
 +     console.log = oldConsoleLog;
 +     logged = "";
 +   });
diff --cc debian/patches/series
index 29ddabf,0000000..51bda4c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,1 @@@
 +0001-Use-sinon-instead-of-sinon-restore.patch
- 0002-Fix-test-suite.patch
- 0003-Do-not-need-to-depends-on-coverage.io-service.patch

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