merging from ruby trunk

atambo · Oct 22, 2012 · 851de5c · 851de5c
1 parent 450f3b0
commit 851de5c
Showing 1 changed file with 0 additions and 16 deletions.
diff --git a/test/psych/test_engine_manager.rb b/test/psych/test_engine_manager.rb
@@ -3,10 +3,6 @@
 
 module Psych
  class TestEngineManager < TestCase
-   def teardown
-     YAML::ENGINE.yamler = 'syck'
-   end
-
    def test_bad_engine
      assert_raises(ArgumentError) do
        YAML::ENGINE.yamler = 'foooo'
@@ -19,18 +15,6 @@ def test_set_psych
      assert_equal 'psych', YAML::ENGINE.yamler
    end
 
-   def test_set_syck
-     YAML::ENGINE.yamler = 'syck'
-     assert_equal ::Syck, YAML
-     assert_equal 'syck', YAML::ENGINE.yamler
-   rescue NameError => e
-     if e.name == :Syck then
-       skip 'syck has been removed'
-     else
-       raise
-     end
-   end
-
    A = Struct.new(:name)
 
    def test_dump_types