Merge branch 'merged-bundler' into develop

1 files changed, 0 insertions, 41 deletions

diff --git a/vendor/gems/gettext-2.1.0/test/test_thread.rb b/vendor/gems/gettext-2.1.0/test/test_thread.rb
deleted file mode 100644
index 5fa8be84f..000000000
--- a/vendor/gems/gettext-2.1.0/test/test_thread.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require 'testlib/helper.rb'
-require 'thread'
-
-class TestThread < Test::Unit::TestCase
-  include GetText
-
-  bindtextdomain "test1", :path => "locale"
-
-  def setup
-    Locale.init(:driver => :env)
-    @mutex = Mutex.new
-  end
-
-  def invoke_thread(tag, language, sleep_time)
-    Thread.start do
-      @mutex.synchronize {
-        Thread.current["language"] = language
-        GetText.current_locale = tag
-      }
-      (1..10).each do |v|
-        @mutex.synchronize{
-          assert_equal Thread.current["language"], _("language") 
-        }
-        print "."
-        $stdout.flush
-        sleep sleep_time
-      end
-    end
-  end
-
-  def test_thread
-    th1 = invoke_thread("ja_JP.eucJP", "japanese", 0.4)
-    th2 = invoke_thread("fr", "french", 0.3)
-    th3 = invoke_thread("en", "language", 0.1)
-    th4 = invoke_thread("zh_CN", "language", 0.2) # No translation.
-    th1.join
-    th2.join   
-    th3.join
-    th4.join
-  end
-end