Use ftp for the service in getaddrinfo/getnameinfo/getservbyname specs

* Solaris cannot resolve 'http' but can resolve 'ftp'.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 14 deletions

diff --git a/spec/ruby/library/socket/addrinfo/getnameinfo_spec.rb b/spec/ruby/library/socket/addrinfo/getnameinfo_spec.rb
index 2d5c7575d0..3c1a37d9fb 100644
--- a/spec/ruby/library/socket/addrinfo/getnameinfo_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/getnameinfo_spec.rb
@@ -5,26 +5,17 @@ describe 'Addrinfo#getnameinfo' do
   describe 'using an IP Addrinfo' do
     SocketSpecs.each_ip_protocol do |family, ip_address|
       before do
-        @addr = Addrinfo.tcp(ip_address, 80)
+        @addr = Addrinfo.tcp(ip_address, 21)
       end
 
-      platform_is_not :solaris do
-        it 'returns the node and service names' do
-          host, service = @addr.getnameinfo
-          service.should == 'http'
-        end
-      end
-
-      platform_is :solaris do
-        it 'returns the node and service names' do
-          host, service = @addr.getnameinfo
-          service.should == '80'
-        end
+      it 'returns the node and service names' do
+        host, service = @addr.getnameinfo
+        service.should == 'ftp'
       end
 
       it 'accepts flags as a Fixnum as the first argument' do
         host, service = @addr.getnameinfo(Socket::NI_NUMERICSERV)
-        service.should == '80'
+        service.should == '21'
       end
     end
   end