[DRE-commits] [ruby-oj] 02/04: remove 03_deactivate_test_io_string.patch.

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-oj.

commit b6ab11132f2e590cc6598447ae910e03b24cec43
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Aug 27 05:37:07 2014 +0200

    remove 03_deactivate_test_io_string.patch.
    
    string corruption causing test failure fixed upstream
---
 debian/patches/03_deactivate_test_io_string.patch | 52 -----------------------
 debian/patches/series                             |  1 -
 2 files changed, 53 deletions(-)

diff --git a/debian/patches/03_deactivate_test_io_string.patch b/debian/patches/03_deactivate_test_io_string.patch
deleted file mode 100644
index 5444af2..0000000
--- a/debian/patches/03_deactivate_test_io_string.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: deactivate test_io_string
- Those tests cause test_io_file or test_symbol_keys to fail if they are run
- before on armel, armhf, i386 and other architectures.
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=754761
-Bug: https://github.com/ohler55/oj/issues/166
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-08-24
-
---- a/test/test_compat.rb
-+++ b/test/test_compat.rb
-@@ -193,7 +193,7 @@
-   end
- 
-   # Stream IO
--  def test_io_string
-+  def _test_io_string
-     json = %{{
-   "x":true,
-   "y":58,
---- a/test/test_object.rb
-+++ b/test/test_object.rb
-@@ -271,7 +271,7 @@
-   end
- 
-   # Stream IO
--  def test_io_string
-+  def _test_io_string
-     json = %{{
-   "x":true,
-   "y":58,
---- a/test/test_strict.rb
-+++ b/test/test_strict.rb
-@@ -150,7 +150,7 @@
-   end
- 
-   # Stream IO
--  def test_io_string
-+  def _test_io_string
-     json = %{{
-   "x":true,
-   "y":58,
---- a/test/test_various.rb
-+++ b/test/test_various.rb
-@@ -1068,7 +1068,7 @@
-   end
- 
- # Stream IO
--  def test_io_string
-+  def _test_io_string
-     src = { 'x' => true, 'y' => 58, 'z' => [1, 2, 3]}
-     output = StringIO.open("", "w+")
-     Oj.to_stream(output, src)
diff --git a/debian/patches/series b/debian/patches/series
index 54cc90e..d0b6e42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_dont_mess_with_loadpath.patch
 02_avoid_name_conflict_with_ext.patch
-03_deactivate_test_io_string.patch

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