Update to ruby/spec@6cf8ebe

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

5 files changed, 8 insertions, 10 deletions

diff --git a/spec/ruby/library/socket/addrinfo/ipv4_multicast_spec.rb b/spec/ruby/library/socket/addrinfo/ipv4_multicast_spec.rb
index 81a68d3d13..bdd14c1b00 100644
--- a/spec/ruby/library/socket/addrinfo/ipv4_multicast_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ipv4_multicast_spec.rb
@@ -7,7 +7,7 @@ describe "Addrinfo#ipv4_multicast?" do
     Addrinfo.ip('239.255.255.250').ipv4_multicast?.should == true
   end
 
-  it 'returns false for a regular addrss' do
+  it 'returns false for a regular address' do
     Addrinfo.ip('8.8.8.8').ipv4_multicast?.should == false
   end
 
diff --git a/spec/ruby/library/socket/ancillarydata/cmsg_is_spec.rb b/spec/ruby/library/socket/ancillarydata/cmsg_is_spec.rb
index bf93cd977e..50763e28b1 100644
--- a/spec/ruby/library/socket/ancillarydata/cmsg_is_spec.rb
+++ b/spec/ruby/library/socket/ancillarydata/cmsg_is_spec.rb
@@ -25,7 +25,7 @@ with_feature :ancillary_data do
         @data.cmsg_is?(:SOCKET, :RIGHTS).should == false
       end
 
-      it 'raises SocketError when comparign with :IPV6 and :RIGHTS' do
+      it 'raises SocketError when comparing with :IPV6 and :RIGHTS' do
         lambda { @data.cmsg_is?(:IPV6, :RIGHTS) }.should raise_error(SocketError)
       end
     end
diff --git a/spec/ruby/library/socket/basicsocket/getsockname_spec.rb b/spec/ruby/library/socket/basicsocket/getsockname_spec.rb
index a2c5980a9e..b33db088b6 100644
--- a/spec/ruby/library/socket/basicsocket/getsockname_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/getsockname_spec.rb
@@ -7,7 +7,7 @@ describe "Socket::BasicSocket#getsockname" do
     @socket.close
   end
 
-  it "returns the sockaddr associacted with the socket" do
+  it "returns the sockaddr associated with the socket" do
     @socket = TCPServer.new("127.0.0.1", 0)
     sockaddr = Socket.unpack_sockaddr_in(@socket.getsockname)
     sockaddr.should == [@socket.addr[1], "127.0.0.1"]
diff --git a/spec/ruby/library/socket/ipsocket/getaddress_spec.rb b/spec/ruby/library/socket/ipsocket/getaddress_spec.rb
index 2ee35af5b5..8e14707d4f 100644
--- a/spec/ruby/library/socket/ipsocket/getaddress_spec.rb
+++ b/spec/ruby/library/socket/ipsocket/getaddress_spec.rb
@@ -17,11 +17,9 @@ describe "Socket::IPSocket#getaddress" do
   # There is no way to make this fail-proof on all machines, because
   # DNS servers like opendns return A records for ANY host, including
   # traditionally invalidly named ones.
-  quarantine! do
-    it "raises an error on unknown hostnames" do
-      lambda {
-        IPSocket.getaddress("rubyspecdoesntexist.fallingsnow.net")
-      }.should raise_error(SocketError)
-    end
+  it "raises an error on unknown hostnames" do
+    lambda {
+      IPSocket.getaddress("rubyspecdoesntexist.fallingsnow.net")
+    }.should raise_error(SocketError)
   end
 end
diff --git a/spec/ruby/library/socket/unixsocket/peeraddr_spec.rb b/spec/ruby/library/socket/unixsocket/peeraddr_spec.rb
index ec57b40970..e39c8a0570 100644
--- a/spec/ruby/library/socket/unixsocket/peeraddr_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/peeraddr_spec.rb
@@ -16,7 +16,7 @@ describe "UNIXSocket#peeraddr" do
       SocketSpecs.rm_socket @path
     end
 
-    it "returns the address familly and path of the server end of the connection" do
+    it "returns the address family and path of the server end of the connection" do
       @client.peeraddr.should == ["AF_UNIX", @path]
     end