[Checkins] SVN: BTrees/branches/py3k/ Skip tests which need sys.maxint on Py3k.

Tres Seaver cvs-admin at zope.org
Mon Dec 10 22:30:17 UTC 2012


Log message for revision 128575:
  Skip tests which need sys.maxint on Py3k.

Changed:
  _U  BTrees/branches/py3k/
  U   BTrees/branches/py3k/BTrees/tests/test_Length.py
  U   BTrees/branches/py3k/BTrees/tests/test__base.py
  U   BTrees/branches/py3k/BTrees/tests/test_utils.py

-=-
Modified: BTrees/branches/py3k/BTrees/tests/test_Length.py
===================================================================
--- BTrees/branches/py3k/BTrees/tests/test_Length.py	2012-12-10 22:30:16 UTC (rev 128574)
+++ BTrees/branches/py3k/BTrees/tests/test_Length.py	2012-12-10 22:30:17 UTC (rev 128575)
@@ -55,22 +55,30 @@
 
     def test_change_overflows_to_long(self):
         import sys
-        length = self._makeOne(sys.maxint)
-        self.assertEqual(length(), sys.maxint)
-        self.assert_(type(length()) is int)
-        length.change(+1)
-        self.assertEqual(length(), sys.maxint + 1)
-        self.assert_(type(length()) is long)
+        try:
+            length = self._makeOne(sys.maxint)
+        except AttributeError: #pragma NO COVER Py3k
+            return
+        else: #pragma NO COVER Py2
+            self.assertEqual(length(), sys.maxint)
+            self.assert_(type(length()) is int)
+            length.change(+1)
+            self.assertEqual(length(), sys.maxint + 1)
+            self.assert_(type(length()) is long)
 
     def test_change_underflows_to_long(self):
         import sys
-        minint = (-sys.maxint) - 1
-        length = self._makeOne(minint)
-        self.assertEqual(length(), minint)
-        self.assert_(type(length()) is int)
-        length.change(-1)
-        self.assertEqual(length(), minint - 1)
-        self.assert_(type(length()) is long)
+        try:
+            minint = (-sys.maxint) - 1
+        except AttributeError: #pragma NO COVER Py3k
+            return
+        else: #pragma NO COVER Py2
+            length = self._makeOne(minint)
+            self.assertEqual(length(), minint)
+            self.assert_(type(length()) is int)
+            length.change(-1)
+            self.assertEqual(length(), minint - 1)
+            self.assert_(type(length()) is long)
 
     def test___call___no_args(self):
         length = self._makeOne(42)

Modified: BTrees/branches/py3k/BTrees/tests/test__base.py
===================================================================
--- BTrees/branches/py3k/BTrees/tests/test__base.py	2012-12-10 22:30:16 UTC (rev 128574)
+++ BTrees/branches/py3k/BTrees/tests/test__base.py	2012-12-10 22:30:17 UTC (rev 128575)
@@ -2824,7 +2824,10 @@
         import sys
         from BTrees._base import to_int
         faux_self = object()
-        self.assertRaises(TypeError, to_int, faux_self, sys.maxint + 1)
+        try:
+            self.assertRaises(TypeError, to_int, faux_self, sys.maxint + 1)
+        except AttributeError: #pragma NO COVER Py3k
+            pass
 
     def test_to_int_w_invalid(self):
         from BTrees._base import to_int
@@ -2863,7 +2866,10 @@
         import sys
         from BTrees._base import to_long
         faux_self = object()
-        self.assertRaises(ValueError, to_long, faux_self, sys.maxint + 1)
+        try:
+            self.assertRaises(ValueError, to_long, faux_self, sys.maxint + 1)
+        except AttributeError: #pragma NO COVER Py3k
+            pass
 
     def test_to_long_w_invalid(self):
         from BTrees._base import to_long

Modified: BTrees/branches/py3k/BTrees/tests/test_utils.py
===================================================================
--- BTrees/branches/py3k/BTrees/tests/test_utils.py	2012-12-10 22:30:16 UTC (rev 128574)
+++ BTrees/branches/py3k/BTrees/tests/test_utils.py	2012-12-10 22:30:17 UTC (rev 128575)
@@ -22,11 +22,17 @@
 
     def test_w_big_negative(self):
         import sys
-        self.assertEqual(self._callFUT(-sys.maxint), 1)
+        try:
+            self.assertEqual(self._callFUT(-sys.maxint), 1)
+        except AttributeError: #pragma NO COVER Py3k
+            pass
 
     def test_w_negative(self):
         import sys
-        self.assertEqual(self._callFUT(-1), sys.maxint)
+        try:
+            self.assertEqual(self._callFUT(-1), sys.maxint)
+        except AttributeError: #pragma NO COVER Py3k
+            pass
 
     def test_w_zero(self):
         self.assertEqual(self._callFUT(0), 0)
@@ -36,7 +42,10 @@
 
     def test_w_big_positive(self):
         import sys
-        self.assertEqual(self._callFUT(sys.maxint), sys.maxint)
+        try:
+            self.assertEqual(self._callFUT(sys.maxint), sys.maxint)
+        except AttributeError: #pragma NO COVER Py3k
+            pass
 
 
 class Test_oid_repr(unittest.TestCase):



More information about the checkins mailing list