[Pkg-javascript-commits] [node-coveralls] 310/332: merge patched into master
Bastien Roucariès
rouca at moszumanska.debian.org
Thu Nov 9 13:54:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
rouca pushed a commit to branch master
in repository node-coveralls.
commit 717a1875da082985f7aaa81520634a60585b887f
Merge: da41a5f 22ce90b
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date: Fri Sep 8 00:04:44 2017 +0200
merge patched into master
debian/.git-dpm | 4 ++--
debian/patches/0001-Relax-node-request-version.patch | 2 +-
debian/patches/0002-Do-not-use-sinon-restore-but-sinon.patch | 2 +-
debian/patches/0003-Fix-path-with-version-in-test.patch | 2 +-
debian/patches/0004-Disable-a-test-that-need-a-full-git-tree.patch | 2 +-
package.json | 2 +-
test/detectLocalGit.js | 2 +-
test/fetchGitData.js | 3 ++-
test/getOptions.js | 2 ++
test/handleInput.js | 6 +++---
test/logger.js | 2 +-
test/sendToCoveralls.js | 4 ++--
12 files changed, 18 insertions(+), 15 deletions(-)
diff --cc debian/.git-dpm
index 5556619,0000000..b5a2062
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
- 9c96b6a69bb8ff6adb1db5594c487f677762f434
- 9c96b6a69bb8ff6adb1db5594c487f677762f434
++22ce90b2a70038e3a24375419e206b07322a74e5
++22ce90b2a70038e3a24375419e206b07322a74e5
+9c96b6a69bb8ff6adb1db5594c487f677762f434
+9c96b6a69bb8ff6adb1db5594c487f677762f434
+node-coveralls_2.13.1.orig.tar.gz
+d70bb9acc1835ec4f063ff9dac5423c17b11f178
+16983
diff --cc debian/patches/0001-Relax-node-request-version.patch
index ec252a2,0000000..5d5e47e
mode 100644,000000..100644
--- a/debian/patches/0001-Relax-node-request-version.patch
+++ b/debian/patches/0001-Relax-node-request-version.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 7d85c508c954e8fd7b930d3569bdef56621c7e2f Mon Sep 17 00:00:00 2001
++From 96ebcc6a5eb26d8a8cab5544d23e5f9455dfe1ae Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
+Date: Thu, 7 Sep 2017 22:01:29 +0200
+Subject: Relax node-request version
+
+Forwarded: no
+---
+ package.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/package.json b/package.json
+index 1c56d61..425782c 100644
+--- a/package.json
++++ b/package.json
+@@ -34,7 +34,7 @@
+ "lcov-parse": "0.0.10",
+ "log-driver": "1.2.5",
+ "minimist": "1.2.0",
+- "request": "2.79.0"
++ "request": "^2.26"
+ },
+ "devDependencies": {
+ "istanbul": "0.4.5",
diff --cc debian/patches/0002-Do-not-use-sinon-restore-but-sinon.patch
index 93066a5,0000000..c2a898c
mode 100644,000000..100644
--- a/debian/patches/0002-Do-not-use-sinon-restore-but-sinon.patch
+++ b/debian/patches/0002-Do-not-use-sinon-restore-but-sinon.patch
@@@ -1,65 -1,0 +1,65 @@@
- From 33b564e566ce8008ad64a4678fc50ac695a418a7 Mon Sep 17 00:00:00 2001
++From 771d1f464211131589ec283027dca35318d3a105 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
+Date: Thu, 7 Sep 2017 22:04:18 +0200
+Subject: Do not use sinon-restore but sinon
+
+Forwarded: no
+---
+ test/handleInput.js | 6 +++---
+ test/logger.js | 2 +-
+ test/sendToCoveralls.js | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/handleInput.js b/test/handleInput.js
+index dc88902..cc51e7a 100644
+--- a/test/handleInput.js
++++ b/test/handleInput.js
+@@ -1,13 +1,13 @@
+ var should = require('should');
+-var sinon = require('sinon-restore');
++var sinon = require('sinon').sandbox.create();
+ var index = require('../index');
+ var fs = require('fs');
+ logger = require('log-driver')({level : false});
+
+ describe("handleInput", function(){
+ afterEach(function() {
+- sinon.restoreAll();
+- });
++ sinon.restore();
++ });
+ it ("returns an error when there's an error getting options", function(done){
+ sinon.stub(index, 'getOptions', function(cb){
+ return cb("some error", {});
+diff --git a/test/logger.js b/test/logger.js
+index 19767df..5430829 100644
+--- a/test/logger.js
++++ b/test/logger.js
+@@ -1,5 +1,5 @@
+ var should = require('should');
+-var sinon = require('sinon-restore');
++var sinon = require('sinon');
+ var index = require('../index');
+
+ describe("logger", function(){
+diff --git a/test/sendToCoveralls.js b/test/sendToCoveralls.js
+index 6121bbb..3589bd8 100644
+--- a/test/sendToCoveralls.js
++++ b/test/sendToCoveralls.js
+@@ -1,6 +1,6 @@
+ var should = require('should');
+ var request = require('request');
+-var sinon = require('sinon-restore');
++var sinon = require('sinon').sandbox.create();
+ var index = require('../index');
+ logger = require('log-driver')({level : false});
+
+@@ -11,7 +11,7 @@ describe("sendToCoveralls", function(){
+ });
+
+ afterEach(function() {
+- sinon.restoreAll();
++ sinon.restore();
+ if (realCoverallsHost !== undefined) {
+ process.env.COVERALLS_ENDPOINT = realCoverallsHost;
+ } else {
diff --cc debian/patches/0003-Fix-path-with-version-in-test.patch
index 106ca9d,0000000..f36da2b
mode 100644,000000..100644
--- a/debian/patches/0003-Fix-path-with-version-in-test.patch
+++ b/debian/patches/0003-Fix-path-with-version-in-test.patch
@@@ -1,23 -1,0 +1,23 @@@
- From ca412d01f56d390167f2b14163e271190df37d54 Mon Sep 17 00:00:00 2001
++From 4d9e62dea62ce81c3e4279f0573c95b30d571cd9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
+Date: Thu, 7 Sep 2017 22:54:41 +0200
+Subject: Fix path with version in test
+
+Forwarded: no
+---
+ test/detectLocalGit.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/detectLocalGit.js b/test/detectLocalGit.js
+index 64da493..f47163f 100644
+--- a/test/detectLocalGit.js
++++ b/test/detectLocalGit.js
+@@ -57,7 +57,7 @@ function _cleanTempGitDir() {
+
+ function _deleteFolderRecursive(dir) {
+
+- if (!dir.match('node-coveralls/test')) {
++ if (!dir.match('node-coveralls[^/]*/test')) {
+ throw new Error('Tried to clean a temp git directory that did not match path: node-coveralls/test');
+ }
+
diff --cc debian/patches/0004-Disable-a-test-that-need-a-full-git-tree.patch
index 9978f00,0000000..93f39f4
mode 100644,000000..100644
--- a/debian/patches/0004-Disable-a-test-that-need-a-full-git-tree.patch
+++ b/debian/patches/0004-Disable-a-test-that-need-a-full-git-tree.patch
@@@ -1,46 -1,0 +1,46 @@@
- From b36b85eb162755f0c3fc04b9aec8d92c7f70f94c Mon Sep 17 00:00:00 2001
++From 22ce90b2a70038e3a24375419e206b07322a74e5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
+Date: Thu, 7 Sep 2017 23:06:35 +0200
+Subject: Disable a test that need a full git tree
+
+Forwarded; no
+---
+ test/fetchGitData.js | 3 ++-
+ test/getOptions.js | 2 ++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/test/fetchGitData.js b/test/fetchGitData.js
+index 012e129..cd42605 100644
+--- a/test/fetchGitData.js
++++ b/test/fetchGitData.js
+@@ -163,6 +163,7 @@ describe("fetchGitData", function(){
+ done();
+ });
+ });
++ /*
+ it("should execute git commands when a valid commit hash is given", function(done) {
+ process.env.COVERALLS_GIT_COMMIT = "HEAD";
+ process.env.COVERALLS_GIT_BRANCH = "master";
+@@ -178,5 +179,5 @@ describe("fetchGitData", function(){
+ options.remotes.length.should.be.above(0);
+ done();
+ });
+- });
++ });*/
+ });
+diff --git a/test/getOptions.js b/test/getOptions.js
+index 51e4fa0..cea0dee 100644
+--- a/test/getOptions.js
++++ b/test/getOptions.js
+@@ -25,9 +25,11 @@ describe("getBaseOptions", function(){
+ it ("should detect detached git head if no hash passed in", function(done) {
+ testGitDetachedHeadDetection(getBaseOptions, done);
+ });
++ /*
+ it ("should fail local Git detection if no .git directory", function(done) {
+ testNoLocalGit(getBaseOptions, done);
+ });
++ */
+ it ("should set repo_token if it exists", function(done){
+ testRepoToken(getBaseOptions, done);
+ });
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-coveralls.git
More information about the Pkg-javascript-commits
mailing list