From 035ef0a3475943d92f813a6449a33dc07b6d4e4c Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 27 Jul 2011 01:40:07 +0000
Subject: 	* lib/rubygems:  Update to RubyGems 1.8.6.1.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/rubygems/test_gem_stream_ui.rb | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'test/rubygems/test_gem_stream_ui.rb')

diff --git a/test/rubygems/test_gem_stream_ui.rb b/test/rubygems/test_gem_stream_ui.rb
index 2a99af037e..f4835685a1 100644
--- a/test/rubygems/test_gem_stream_ui.rb
+++ b/test/rubygems/test_gem_stream_ui.rb
@@ -1,9 +1,3 @@
-######################################################################
-# This file is imported from the rubygems project.
-# DO NOT make modifications in this repo. They _will_ be reverted!
-# File a patch instead and assign it to Ryan Davis or Eric Hodel.
-######################################################################
-
 require 'rubygems/test_case'
 require 'rubygems/user_interaction'
 require 'timeout'
@@ -41,6 +35,9 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask
+    skip 'TTY detection broken on windows' if
+      Gem.win_platform? unless RUBY_VERSION > '1.9.2'
+
     timeout(1) do
       expected_answer = "Arthur, King of the Britons"
       @in.string = "#{expected_answer}\n"
@@ -50,6 +47,9 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask_no_tty
+    skip 'TTY detection broken on windows' if
+      Gem.win_platform? unless RUBY_VERSION > '1.9.2'
+
     @in.tty = false
 
     timeout(0.1) do
@@ -59,6 +59,9 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask_for_password
+    skip 'Always uses $stdin on windows' if
+      Gem.win_platform? unless RUBY_VERSION > '1.9.2'
+
     timeout(1) do
       expected_answer = "Arthur, King of the Britons"
       @in.string = "#{expected_answer}\n"
@@ -68,6 +71,9 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask_for_password_no_tty
+    skip 'TTY handling is broken on windows' if
+      Gem.win_platform? unless RUBY_VERSION > '1.9.2'
+
     @in.tty = false
 
     timeout(0.1) do
@@ -77,6 +83,9 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask_yes_no_no_tty_with_default
+    skip 'TTY handling is broken on windows' if
+      Gem.win_platform? unless RUBY_VERSION > '1.9.2'
+
     @in.tty = false
 
     timeout(0.1) do
@@ -89,6 +98,9 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask_yes_no_no_tty_without_default
+    skip 'TTY handling is broken on windows' if
+      Gem.win_platform? unless RUBY_VERSION > '1.9.2'
+
     @in.tty = false
 
     timeout(0.1) do
-- 
cgit v1.2.3