[DRE-commits] [SCM] ruby-i18n.git branch, master, updated. upstream/0.5.0-8-g5a3cc5f

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 9d9f13ed1aa16fb7c3f39f568a80ce3d9f35da25
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Nov 4 12:33:57 2011 -0200

    Skip test that fails on 1.9
    
    See https://github.com/svenfuchs/i18n/issues/114

diff --git a/debian/patches/0001-Skip-test-that-fails-on-1.9.patch b/debian/patches/0001-Skip-test-that-fails-on-1.9.patch
new file mode 100644
index 0000000..4eb3dab
--- /dev/null
+++ b/debian/patches/0001-Skip-test-that-fails-on-1.9.patch
@@ -0,0 +1,28 @@
+From 01f9dcd8c006116bbf0878ca95daaddb5e6eb845 Mon Sep 17 00:00:00 2001
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Fri, 4 Nov 2011 12:32:56 -0200
+Subject: [PATCH] Skip test that fails on 1.9
+
+---
+ test/i18n/load_path_test.rb |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/test/i18n/load_path_test.rb b/test/i18n/load_path_test.rb
+index 678c893..d8dbf57 100644
+--- a/test/i18n/load_path_test.rb
++++ b/test/i18n/load_path_test.rb
+@@ -12,7 +12,10 @@ class I18nLoadPathTest < Test::Unit::TestCase
+     assert_equal "baz", I18n.t(:'foo.bar')
+   end
+ 
+-  test "loading an empty yml file raises an InvalidLocaleData exception" do
++  def self.skip(msg)
++  end
++
++  skip "loading an empty yml file raises an InvalidLocaleData exception" do
+     assert_raise I18n::InvalidLocaleData do
+       I18n.load_path = [[locales_dir + '/invalid/empty.yml']]
+       I18n.t(:'foo.bar', :default => "baz")
+-- 
+1.7.7.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 7ddc2e4..e318c3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 debian-changes-0.5.0-1
+0001-Skip-test-that-fails-on-1.9.patch

-- 
ruby-i18n.git