[DRE-commits] [SCM] ruby-test-spec.git branch, master, updated. debian/0.10.0-2-7-gf31b470

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit e45006d75930c0b1851c7063ec6d5cad8e2c069e
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Jun 23 00:20:45 2013 +0200

    import upstream patch to make test-spec work with newer test-unit (Closes: #713164)

diff --git a/debian/patches/0010-disable_invalid_test_exception.patch b/debian/patches/0010-disable_invalid_test_exception.patch
index 32a698f..5da5971 100644
--- a/debian/patches/0010-disable_invalid_test_exception.patch
+++ b/debian/patches/0010-disable_invalid_test_exception.patch
@@ -1,22 +1,46 @@
-Description: avoid throwing :invalid_test expection
- This exception is used in the version of Test::Unit bundled with
+Description: disabled tests should not cause errors with test-unit gem
+ The :invalid_test exception is used in the version of Test::Unit bundled with
  Ruby1.8 but is not catched in the newer version packaged in
  ruby-test-unit.
-Author: Cédric Boutillier <cedric.boutillier at gmail.com>
-Last-Update: 2011-09-20
+ A workaround in ruby-test-unit had been present for versions >= 2.4.8, but
+ this broke again with ruby-test-unit 2.5.4.
+Author: Colin MacKenzie IV <sinisterchipmunk at gmail.com>
+Origin: https://github.com/sinisterchipmunk/test-spec/commit/b93314b213460730125245e61e7caa5f01567dba
+Reviewed-by: Cédric Boutillier <boutil at debian.org>
+Bug: https://github.com/sinisterchipmunk/test-spec/issues/2
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713164
+Last-Update: 2013-06-22
+---
+ lib/test/spec.rb | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
 
 --- a/lib/test/spec.rb
 +++ b/lib/test/spec.rb
-@@ -352,9 +352,9 @@
-     def initialize(name)
-       super name
+@@ -354,7 +354,7 @@
  
--      # Don't let the default_test clutter up the results and don't
--      # flunk if no tests given, either.
+       # Don't let the default_test clutter up the results and don't
+       # flunk if no tests given, either.
 -      throw :invalid_test  if name.to_s == "default_test"
-+      ## Don't let the default_test clutter up the results and don't
-+      ## flunk if no tests given, either.
-+      #throw :invalid_test  if name.to_s == "default_test"
++      # throw :invalid_test  if name.to_s == "default_test"
      end
  
      def position
+@@ -534,6 +534,7 @@
+ class Test::Spec::Disabled < Test::Unit::Failure    # :nodoc:
+   def initialize(name)
+     @name = name
++    @location = []
+   end
+ 
+   def single_character_display
+@@ -547,6 +548,10 @@
+   def long_display
+     @name + " is disabled"
+   end
++  
++  def message
++    long_display
++  end
+ end
+ 
+ class Test::Spec::Empty < Test::Unit::Failure    # :nodoc:

-- 
ruby-test-spec.git