[DRE-commits] [ruby-parallel] 02/06: d/patches: Refresh Debian patches

[Sebastien Badia]

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

sbadia pushed a commit to branch master
in repository ruby-parallel.

commit 5ae37aa0f4a2e1a1086a7ce835b8750d87e2a6fe
Author: Sebastien Badia <seb at sebian.fr>
Date:   Mon Aug 21 16:23:07 2017 +0200

    d/patches: Refresh Debian patches
---
 .../0002-disable-failing-test-counting-open-pipes.patch      |  4 +---
 debian/patches/0003-disable-tests-failing-with-sbuild.patch  | 12 +++++-------
 .../0004-disable-test-in-isolation-with-autopkgtest.patch    |  8 +++-----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/debian/patches/0002-disable-failing-test-counting-open-pipes.patch b/debian/patches/0002-disable-failing-test-counting-open-pipes.patch
index 1b2d487..d211509 100644
--- a/debian/patches/0002-disable-failing-test-counting-open-pipes.patch
+++ b/debian/patches/0002-disable-failing-test-counting-open-pipes.patch
@@ -6,11 +6,9 @@ Subject: disable failing test counting open pipes
  spec/parallel_spec.rb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/spec/parallel_spec.rb b/spec/parallel_spec.rb
-index 0572b23..f7be7a3 100644
 --- a/spec/parallel_spec.rb
 +++ b/spec/parallel_spec.rb
-@@ -168,7 +168,7 @@ describe Parallel do
+@@ -187,7 +187,7 @@ describe Parallel do
        `ruby spec/cases/closes_processes_at_runtime.rb`.should == 'OK'
      end
  
diff --git a/debian/patches/0003-disable-tests-failing-with-sbuild.patch b/debian/patches/0003-disable-tests-failing-with-sbuild.patch
index b39f755..9c513a7 100644
--- a/debian/patches/0003-disable-tests-failing-with-sbuild.patch
+++ b/debian/patches/0003-disable-tests-failing-with-sbuild.patch
@@ -6,8 +6,6 @@ Subject: disable tests failing with sbuild
  spec/parallel_spec.rb | 23 +++++++++++++----------
  1 file changed, 13 insertions(+), 10 deletions(-)
 
-diff --git a/spec/parallel_spec.rb b/spec/parallel_spec.rb
-index f7be7a3..654623f 100644
 --- a/spec/parallel_spec.rb
 +++ b/spec/parallel_spec.rb
 @@ -12,8 +12,11 @@ describe Parallel do
@@ -24,7 +22,7 @@ index f7be7a3..654623f 100644
    end
  
    def execute_start_and_kill(command, amount, signal='INT')
-@@ -79,27 +82,27 @@ describe Parallel do
+@@ -90,27 +93,27 @@ describe Parallel do
        `ruby spec/cases/parallel_influence_outside_data.rb`.should == "yes"
      end
  
@@ -56,7 +54,7 @@ index f7be7a3..654623f 100644
        time_taken {
          result = execute_start_and_kill "PROCESS SIGTERM", 4
          result.should include 'FINISHED'
-@@ -108,7 +111,7 @@ describe Parallel do
+@@ -119,7 +122,7 @@ describe Parallel do
        }.should be <= 7
      end
  
@@ -65,7 +63,7 @@ index f7be7a3..654623f 100644
        time_taken {
          result = execute_start_and_kill "THREAD SIGTERM", 2
          result.should include 'FINISHED'
-@@ -117,7 +120,7 @@ describe Parallel do
+@@ -128,7 +131,7 @@ describe Parallel do
        }.should be <= 7
      end
  
@@ -74,7 +72,7 @@ index f7be7a3..654623f 100644
        time_taken do
          t = Thread.new { `ruby spec/cases/parallel_fast_exit.rb 2>&1` }
          sleep 2
-@@ -129,7 +132,7 @@ describe Parallel do
+@@ -140,7 +143,7 @@ describe Parallel do
        end.should <= 4
      end
  
@@ -83,7 +81,7 @@ index f7be7a3..654623f 100644
        t = Thread.new { `ruby spec/cases/double_interrupt.rb 2>&1 && echo FIN` }
        sleep 2
        kill_process_with_name("spec/cases/double_interrupt.rb") #simulates Ctrl+c
-@@ -364,7 +367,7 @@ describe Parallel do
+@@ -383,7 +386,7 @@ describe Parallel do
        `ruby spec/cases/eof_in_process.rb 2>&1`.should include 'Yep, EOF'
      end
  
diff --git a/debian/patches/0004-disable-test-in-isolation-with-autopkgtest.patch b/debian/patches/0004-disable-test-in-isolation-with-autopkgtest.patch
index cb2e134..06f9c7a 100644
--- a/debian/patches/0004-disable-test-in-isolation-with-autopkgtest.patch
+++ b/debian/patches/0004-disable-test-in-isolation-with-autopkgtest.patch
@@ -6,16 +6,14 @@ Subject: disable test in isolation with autopkgtest
  spec/parallel_spec.rb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/spec/parallel_spec.rb b/spec/parallel_spec.rb
-index 654623f..7f3c50c 100644
 --- a/spec/parallel_spec.rb
 +++ b/spec/parallel_spec.rb
-@@ -389,7 +389,7 @@ describe Parallel do
-     it 'can work in isolation' do
+@@ -409,7 +409,7 @@ describe Parallel do
+       skip if ENV['TRAVIS'] # this randomly hangs on travis
        out = `ruby spec/cases/map_isolation.rb`
        out.should == "1\n2\n3\n4\nOK"
 -    end
 +    end unless ENV['AUTOPKGTEST_TMP']
  
      it 'sets Parallel.worker_number when run with isolation' do
-       out = `ruby spec/cases/map_worker_number_isolation.rb`
+       skip if ENV['TRAVIS'] # this randomly hangs on travis

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-parallel.git