[Pkg-javascript-commits] [node-coveralls] 04/08: merge patched into master

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to tag debian-3.0.0-2
in repository node-coveralls.

commit 41bf5b3bc6401990c5b1cc28d2ed97c123734d79
Merge: 9a4c70a f250b25
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Mon Feb 19 00:19:44 2018 +0100

    merge patched into master

 debian/.git-dpm                                                    | 4 ++--
 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 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index b438fb9,0000000..440acec
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
- 2297ed854a5fd26ff119376fbaaf4a19d3c38bc3
- 2297ed854a5fd26ff119376fbaaf4a19d3c38bc3
++f250b25adcbd050409c1c68e8cc5dd469fdd3e8e
++f250b25adcbd050409c1c68e8cc5dd469fdd3e8e
 +0fd1604e6190e44c4b6c78bdc9bc7024a4269642
 +0fd1604e6190e44c4b6c78bdc9bc7024a4269642
 +node-coveralls_3.0.0.orig.tar.gz
 +22ef730330538080d29b8c151dc9146afde88a99
 +16987
diff --cc debian/patches/0003-Fix-path-with-version-in-test.patch
index a460d85,0000000..f8de506
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 4e86ed530e913d7b9652507784d850e1301d313a Mon Sep 17 00:00:00 2001
++From 99060b0f16f9ce99cc6c0cdce67c532d2a6125a2 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 bf3fb80,0000000..409d881
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,75 -1,0 +1,75 @@@
- From 2297ed854a5fd26ff119376fbaaf4a19d3c38bc3 Mon Sep 17 00:00:00 2001
++From f250b25adcbd050409c1c68e8cc5dd469fdd3e8e 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   | 7 ++++++-
 + 2 files changed, 8 insertions(+), 2 deletions(-)
 +
 +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..f03ca94 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);
 +   });
 +@@ -101,9 +103,11 @@ describe("getOptions", function(){
 +   it ("should detect detached git head if no hash passed in", function(done) {
 +     testGitDetachedHeadDetection(getOptions, done);
 +   });
 ++  /*
 +   it ("should fail local Git detection if no .git directory", function(done) {
 +     testNoLocalGit(getOptions, done);
 +   });
 ++  */
 +   it ("should set repo_token if it exists", function(done){
 +     testRepoToken(getOptions, done);
 +   });
 +@@ -143,6 +147,7 @@ describe("getOptions", function(){
 +   it ("should set service_name and service_job_id if it's running via Surf", function(done){
 +     testSurf(getOptions, done);
 +   });
 ++  /*
 +   it ("should override set options with user options", function(done){
 +     var userOptions = {service_name: 'OVERRIDDEN_SERVICE_NAME'};
 +     process.env.COVERALLS_SERVICE_NAME = "SERVICE_NAME";
 +@@ -150,7 +155,7 @@ describe("getOptions", function(){
 +       options.service_name.should.equal("OVERRIDDEN_SERVICE_NAME");
 +       done();
 +     }, userOptions);
 +-  });
 ++  });*/
 + });
 + 
 + var testServiceJobId = function(sut, done){

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