[DRE-commits] [SCM] ruby-test-unit.git branch, master, updated. upstream/2.4.0-12-gcbab590

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit cbab590b0f06a2878932f28e4f07f765d882362d
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Mon Sep 26 02:05:12 2011 +0200

    use upstream patch to solve encoding issue in test-assertions.rb

diff --git a/debian/changelog b/debian/changelog
index 2f06338..7d06d3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 ruby-test-unit (2.4.0-1) unstable; urgency=low
 
   * Initial release (Closes: #626792)
-  * add 0010-fix_default_external_encoding.patch to fix encoding issue in
-    test_assert_equal_with_different_encoding test
+  * add 0010-fix_test_assert_equal_with_different_encoding.patch to fix 
+    encoding issue in  test/test-assertions.rb
   * document in README.Debian the fact that this package overrides test/unit
     bundled with the interpreter 
 
diff --git a/debian/patches/0010-fix_default_external_encoding.patch b/debian/patches/0010-fix_default_external_encoding.patch
deleted file mode 100644
index 58fe33c..0000000
--- a/debian/patches/0010-fix_default_external_encoding.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: test_assert_equal_with_different_encoding failing with LANG=C
- Setting the default external encoding to UTF-8 fixes the issue.
-Author: Cédric Boutillier <cedric.boutillier at gmail.com>
-Last-Update: 2011-09-19
-Bug: https://github.com/test-unit/test-unit/issues/11
-
---- a/test/test-assertions.rb
-+++ b/test/test-assertions.rb
-@@ -5,6 +5,11 @@
- #             Copyright (c) 2009-2010 Kouhei Sutou. All rights reserved.
- # License:: Ruby license.
- 
-+
-+if RUBY_VERSION =~ /1.9/
-+    Encoding.default_external = Encoding::UTF_8
-+end
-+
- require 'test/unit'
- 
- module Test
diff --git a/debian/patches/0010-fix_test_assert_equal_with_different_encoding.patch b/debian/patches/0010-fix_test_assert_equal_with_different_encoding.patch
new file mode 100644
index 0000000..f1926f4
--- /dev/null
+++ b/debian/patches/0010-fix_test_assert_equal_with_different_encoding.patch
@@ -0,0 +1,18 @@
+Description: test_assert_equal_with_different_encoding failing with LANG=C
+ Setting the default external encoding to UTF-8 fixes the issue.
+Origin: https://github.com/test-unit/test-unit/commit/364b2e9775e0c4177ad23c5700fb78dbf174bf56
+Last-Update: 2011-09-25
+Bug: https://github.com/test-unit/test-unit/issues/11
+Applied-Upstream:
+
+--- a/test/test-assertions.rb
++++ b/test/test-assertions.rb
+@@ -330,7 +330,7 @@
+         end
+         ascii_8bit_string = utf8_string.dup.force_encoding("ascii-8bit")
+         message = <<-EOM.chomp
+-<"こんにちは">("UTF-8") expected but was
++<#{utf8_string.inspect}>("UTF-8") expected but was
+ <#{ascii_8bit_string.inspect}>("ASCII-8BIT").
+ EOM
+         check_fails(message) do
diff --git a/debian/patches/series b/debian/patches/series
index 24e02e5..8ac509c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0010-fix_default_external_encoding.patch
+0010-fix_test_assert_equal_with_different_encoding.patch

-- 
ruby-test-unit.git