Permalink
Browse files

Remove very obsolete test code

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 7afb2ea commit 0003ac99cccf0a91df49f9a1141b175e0f80051c @marcandre marcandre committed Mar 8, 2013
Showing with 1 addition and 38 deletions.
  1. +1 −5 test/drb/drbtest.rb
  2. +0 −33 test/ruby/marshaltestlib.rb
View
@@ -131,11 +131,7 @@ def test_02_unknown
obj = @there.unknown_module
assert_kind_of(DRb::DRbUnknown, obj)
- if RUBY_VERSION >= '1.8'
- assert_equal('DRbEx::', obj.name)
- else
- assert_equal('DRbEx', obj.name)
- end
+ assert_equal('DRbEx::', obj.name)
assert_raise(DRb::DRbUnknownError) do
@there.unknown_error
@@ -244,31 +244,12 @@ def test_string_subclass_extend
end
MyStruct = Struct.new("MyStruct", :a, :b)
- if RUBY_VERSION < "1.8.0"
- # Struct#== is not defined in ruby/1.6
- class MyStruct
- def ==(rhs)
- return true if __id__ == rhs.__id__
- return false unless rhs.is_a?(::Struct)
- return false if self.class != rhs.class
- members.each do |member|
- return false if self.__send__(member) != rhs.__send__(member)
- end
- return true
- end
- end
- end
class MySubStruct < MyStruct; def initialize(v, *args) super(*args); @v = v; end end
def test_struct
marshal_equal(MyStruct.new(1,2))
end
def test_struct_subclass
- if RUBY_VERSION < "1.8.0"
- # Substruct instance cannot be dumped in ruby/1.6
- # ::Marshal.dump(MySubStruct.new(10, 1, 2)) #=> uninitialized struct
- return false
- end
marshal_equal(MySubStruct.new(10,1,2))
end
@@ -433,20 +414,6 @@ def test_string_escape
end
MyStruct2 = Struct.new(:a, :b)
- if RUBY_VERSION < "1.8.0"
- # Struct#== is not defined in ruby/1.6
- class MyStruct2
- def ==(rhs)
- return true if __id__ == rhs.__id__
- return false unless rhs.is_a?(::Struct)
- return false if self.class != rhs.class
- members.each do |member|
- return false if self.__send__(member) != rhs.__send__(member)
- end
- return true
- end
- end
- end
def test_struct_toplevel
o = MyStruct2.new(1,2)
marshal_equal(o)

0 comments on commit 0003ac9

Please sign in to comment.