[Jython-checkins] SF.net SVN: jython:[6388] trunk/jython/Lib/test

[<pj...@us...>]

Revision: 6388
          http://jython.svn.sourceforge.net/jython/?rev=6388&view=rev
Author:   pjenvey
Date:     2009-05-27 01:46:25 +0000 (Wed, 27 May 2009)

Log Message:
-----------
solaris test fixes:
o apply test_socket bsd setsockopt workaround and then some
o extra_collect the particularly garbagey test_scope test twice

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

Modified: trunk/jython/Lib/test/test_scope.py
===================================================================
--- trunk/jython/Lib/test/test_scope.py	2009-05-26 21:57:38 UTC (rev 6387)
+++ trunk/jython/Lib/test/test_scope.py	2009-05-27 01:46:25 UTC (rev 6388)
@@ -438,6 +438,8 @@
 if is_jython:
     from test_weakref import extra_collect
     extra_collect()
+    # A lot of garbage
+    extra_collect()
 vereq(Foo.count, 0)
 
 print "17. class and global"

Modified: trunk/jython/Lib/test/test_socket.py
===================================================================
--- trunk/jython/Lib/test/test_socket.py	2009-05-26 21:57:38 UTC (rev 6387)
+++ trunk/jython/Lib/test/test_socket.py	2009-05-27 01:46:25 UTC (rev 6388)
@@ -23,6 +23,7 @@
 EIGHT_BIT_MSG = 'Bh\xed Al\xe1in \xd3 Cinn\xe9ide anseo\n'
 os_name = platform.java_ver()[3][0]
 is_bsd = os_name == 'Mac OS X' or 'BSD' in os_name
+is_solaris = os_name == 'SunOS'
 
 try:
     True
@@ -535,8 +536,11 @@
         for expected_value in values:
             sock.setsockopt(level, option, expected_value)
             retrieved_value = sock.getsockopt(level, option)
-            self.failUnlessEqual(retrieved_value, expected_value, \
-                "Retrieved option(%s, %s) value %s != %s(value set)" % (level, option, retrieved_value, expected_value))
+            msg = "Retrieved option(%s, %s) value %s != %s(value set)" % (level, option, retrieved_value, expected_value)
+            if is_solaris and option == socket.SO_RCVBUF:
+                self.assert_(retrieved_value >= expected_value, msg)
+            else:
+                self.failUnlessEqual(retrieved_value, expected_value, msg)
 
     def _testUDPOption(self, level, option, values):
         try:
@@ -565,8 +569,8 @@
             sock.bind( (HOST, PORT+1) )
             sock.connect( (HOST, PORT) )
             msg = "Option value '%s'='%s' did not propagate to implementation socket" % (option, values[-1])
-            if is_bsd and option in (socket.SO_RCVBUF, socket.SO_SNDBUF):
-                # XXX: there's no guarantee that bufsize will be the
+            if ((is_bsd or is_solaris) and option in (socket.SO_RCVBUF, socket.SO_SNDBUF)):
+                # NOTE: there's no guarantee that bufsize will be the
                 # exact setsockopt value, particularly after
                 # establishing a connection. seems it will be *at least*
                 # the values we test (which are rather small) on
@@ -587,8 +591,12 @@
             # now bind and listen on the socket i.e. cause the implementation socket to be created
             sock.bind( (HOST, PORT) )
             sock.listen(50)
-            self.failUnlessEqual(sock.getsockopt(level, option), values[-1], \
-                 "Option value '(%s,%s)'='%s' did not propagate to implementation socket" % (level, option, values[-1]))
+            msg = "Option value '(%s,%s)'='%s' did not propagate to implementation socket" % (level, option, values[-1])
+            if is_solaris and option == socket.SO_RCVBUF:
+                # NOTE: see similar bsd/solaris workaround above
+                self.assert_(sock.getsockopt(level, option) >= values[-1], msg)
+            else:
+                self.failUnlessEqual(sock.getsockopt(level, option), values[-1], msg)
             self._testSetAndGetOption(sock, level, option, values)
         finally:
             sock.close()


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