[Jython-checkins] SF.net SVN: jython:[6519] trunk/jython/Lib/test/test_socket.py

[<am...@us...>]

Revision: 6519
          http://jython.svn.sourceforge.net/jython/?rev=6519&view=rev
Author:   amak
Date:     2009-07-07 11:05:16 +0000 (Tue, 07 Jul 2009)

Log Message:
-----------
Commenting out a single test that gives varying results across platforms, and thus cannot be reliably tested.
Also some whitespace cleanup.

Modified Paths:
--------------
    trunk/jython/Lib/test/test_socket.py

Modified: trunk/jython/Lib/test/test_socket.py
===================================================================
--- trunk/jython/Lib/test/test_socket.py	2009-07-07 04:49:12 UTC (rev 6518)
+++ trunk/jython/Lib/test/test_socket.py	2009-07-07 11:05:16 UTC (rev 6519)
@@ -1448,18 +1448,17 @@
         local_ip_address = java.net.InetAddress.getLocalHost().getHostAddress()
         for flags, host_param, expected_canonname, expected_sockaddr in [
             # First passive flag
-        	(socket.AI_PASSIVE, None, "", socket.INADDR_ANY),
-        	(socket.AI_PASSIVE, "", "", local_ip_address),
-        	(socket.AI_PASSIVE, "localhost", "", IPV4_LOOPBACK),
-        	(socket.AI_PASSIVE, local_hostname, "", local_ip_address),
-        	# Now passive flag AND canonname flag
-        	(socket.AI_PASSIVE|socket.AI_CANONNAME, None, "127.0.0.1", "127.0.0.1"),
-        	(socket.AI_PASSIVE|socket.AI_CANONNAME, "", local_hostname, local_ip_address),
-        	# The following result seems peculiar to me, and may be to do with my local machine setup
-        	# Also may be caused by a security permission failure.
-        	# If you have problems with the following result, just comment it out.
-        	(socket.AI_PASSIVE|socket.AI_CANONNAME, "localhost", IPV4_LOOPBACK, IPV4_LOOPBACK),
-        	(socket.AI_PASSIVE|socket.AI_CANONNAME, local_hostname, local_hostname, local_ip_address),
+            (socket.AI_PASSIVE, None, "", socket.INADDR_ANY),
+            (socket.AI_PASSIVE, "", "", local_ip_address),
+            (socket.AI_PASSIVE, "localhost", "", IPV4_LOOPBACK),
+            (socket.AI_PASSIVE, local_hostname, "", local_ip_address),
+            # Now passive flag AND canonname flag
+            (socket.AI_PASSIVE|socket.AI_CANONNAME, None, "127.0.0.1", "127.0.0.1"),
+            (socket.AI_PASSIVE|socket.AI_CANONNAME, "", local_hostname, local_ip_address),
+            # The following gives varying results across platforms and configurations: commenting out for now.
+            # Javadoc: http://java.sun.com/j2se/1.5.0/docs/api/java/net/InetAddress.html#getCanonicalHostName()
+            #(socket.AI_PASSIVE|socket.AI_CANONNAME, "localhost", local_hostname, IPV4_LOOPBACK),
+            (socket.AI_PASSIVE|socket.AI_CANONNAME, local_hostname, local_hostname, local_ip_address),
         ]:
             addrinfos = socket.getaddrinfo(host_param, 0, socket.AF_INET, socket.SOCK_STREAM, 0, flags)
             for family, socktype, proto, canonname, sockaddr in addrinfos:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.