[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#687494: unblock: ruby-mocha/0.11.3-3



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package ruby-mocha, version 0.11.3-3 uploaded in
unstable.

This version fixes RC bug #684860, caused by an improper order of
'require' statement for some particular order of tests.
This has been fixed by modifying slightly one of the patches. The
debdiff against 0.11.3-2 is attached.

Thanks!

Cédric



unblock ruby-mocha/0.11.3-3

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (990, 'unstable'), (500, 'testing'), (150, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.2.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru ruby-mocha-0.11.3/debian/changelog ruby-mocha-0.11.3/debian/changelog
--- ruby-mocha-0.11.3/debian/changelog	2012-06-27 00:01:49.000000000 +0200
+++ ruby-mocha-0.11.3/debian/changelog	2012-09-13 10:53:53.000000000 +0200
@@ -1,3 +1,12 @@
+ruby-mocha (0.11.3-3) unstable; urgency=low
+
+  * Modify remove_rubygems_stuff_in_minitest_test.patch to restore
+    loading of minitest/unit conditional to the definition of MiniTest.
+    Loading minitest/unit before Minitest is defined screens the definition of
+    TestUnitResult, causing tests to fail (Closes: #684860).
+
+ -- Cédric Boutillier <cedric.boutillier@gmail.com>  Wed, 12 Sep 2012 12:41:26 +0200
+
 ruby-mocha (0.11.3-2) unstable; urgency=low
 
   * Bump the build-dependency on gem2deb to >= 0.3.0~ (closes: #674388).
diff -Nru ruby-mocha-0.11.3/debian/patches/remove_rubygems_stuff_in_minitest_test.patch ruby-mocha-0.11.3/debian/patches/remove_rubygems_stuff_in_minitest_test.patch
--- ruby-mocha-0.11.3/debian/patches/remove_rubygems_stuff_in_minitest_test.patch	2012-04-22 18:44:01.000000000 +0200
+++ ruby-mocha-0.11.3/debian/patches/remove_rubygems_stuff_in_minitest_test.patch	2012-09-12 12:40:52.000000000 +0200
@@ -1,16 +1,10 @@
 Description: do not rely on rubygems to load minitest
- Moreover, minitest/unit should be loaded before acceptance_test_helper to
- avoid conflicts with test/unit, which gets loaded in this file if Minitest is
- not defined
 Author: Cédric Boutillier <cedric.boutillier@gmail.com>
-Last-Update: 2011-01-31
+Last-Update: 2012-09-11
 
 --- a/test/acceptance/minitest_test.rb
 +++ b/test/acceptance/minitest_test.rb
-@@ -1,20 +1,9 @@
-+require 'minitest/unit'
- require File.expand_path('../acceptance_test_helper', __FILE__)
- 
+@@ -3,12 +3,12 @@
  if defined?(MiniTest)
    $stderr.puts "TODO: Running suite with MiniTest, running the MiniTestAdapterTest results in an error so skipping it for now."
  else
@@ -20,12 +14,12 @@
 -  rescue Gem::LoadError
 -    # MiniTest gem not available
 -  end
--
--  begin
--    require 'minitest/unit'
--  rescue LoadError
--    # MiniTest not available
--  end
- 
-   if defined?(MiniTest)
++#  begin
++#    require 'rubygems'
++#    gem 'minitest'
++#  rescue Gem::LoadError
++#    # MiniTest gem not available
++#  end
  
+   begin
+     require 'minitest/unit'

Attachment: signature.asc
Description: Digital signature


Reply to: