Enable some test_long tests (#976)

Author: slozier

Src/IronPython/Runtime/Operations/IntOps.cs

@@ -153,6 +153,22 @@ public static object __new__(PythonType cls, string s, int @base) {
             return LiteralParser.ParseIntegerSign(s, @base, start);
         }
 
+        [StaticExtensionMethod]
+        public static object __new__(PythonType cls, string s, object @base) {
+            switch (PythonOps.Index(@base)) {
+                case int i:
+                    return __new__(cls, s, i);
+                case BigInteger bi:
+                    try {
+                        return __new__(cls, s, (int)bi);
+                    } catch (OverflowException) {
+                        return __new__(cls, s, int.MaxValue);
+                    }
+                default:
+                    throw new InvalidOperationException();
+            }
+        }
+
         [StaticExtensionMethod]
         public static object __new__(CodeContext/*!*/ context, PythonType cls, IList<byte> s, int @base=10) {
             object value;
@@ -516,7 +532,7 @@ public static Bytes to_bytes(Int32 value, int length, string byteorder, bool sig
             bool isLittle = byteorder == "little";
             if (!isLittle && byteorder != "big") throw PythonOps.ValueError("byteorder must be either 'little' or 'big'");
 
-            var reqLength = (bit_length(value) + (signed ? 1 : 0)) / 8;
+            var reqLength = (bit_length(value) + (value > 0 && signed ? 1 : 0) + 7) / 8;
             if (reqLength > length) throw PythonOps.OverflowError("int too big to convert");
 
             var bytes = new BigInteger(value).ToByteArray();

Src/IronPython/Runtime/Operations/LongOps.cs

@@ -1016,7 +1016,7 @@ public static BigInteger __round__(BigInteger self, BigInteger ndigits) {
 
             // see https://bugs.python.org/issue4707#msg78141
             var i = BigInteger.Pow(10, -intNDigits);
-            var r = self % (2 * i);
+            var r = Mod(self, 2 * i);
             var o = i / 2;
             self -= r;
 

Src/IronPythonTest/Cases/CPythonCasesManifest.ini

@@ -604,9 +604,8 @@ Ignore=true
 Ignore=true
 Reason=TypeError: unsupported operand type(s) for //: 'timedelta' and 'timedelta' | StackOverflowException - https://github.com/IronLanguages/ironpython2/issues/182
 
-[CPython.test_long]
+[CPython.test_long] # IronPython.test_long_stdlib
 Ignore=true
-Reason=AttributeError: 'module' object has no attribute 'int_info'
 
 [CPython.test_lzma]
 Ignore=true

Src/StdLib/Lib/test/test_long.py

@@ -8,7 +8,7 @@
 import array
 
 # SHIFT should match the value in longintrepr.h for best testing.
-SHIFT = sys.int_info.bits_per_digit
+SHIFT = 30 if sys.implementation.name == "ironpython" else sys.int_info.bits_per_digit # https://github.com/IronLanguages/ironpython3/issues/974
 BASE = 2 ** SHIFT
 MASK = BASE - 1
 KARATSUBA_CUTOFF = 70   # from longobject.c
@@ -949,15 +949,21 @@ def test_round(self):
             got = round(10**k + 324678, -3)
             expect = 10**k + 325000
             self.assertEqual(got, expect)
-            self.assertIs(type(got), int)
+            if sys.implementation.name == "ironpython": # https://github.com/IronLanguages/ironpython3/issues/52
+                self.assertTrue(isinstance(got, int))
+            else:
+                self.assertIs(type(got), int)
 
         # nonnegative second argument: round(x, n) should just return x
         for n in range(5):
             for i in range(100):
                 x = random.randrange(-10000, 10000)
                 got = round(x, n)
                 self.assertEqual(got, x)
-                self.assertIs(type(got), int)
+                if sys.implementation.name == "ironpython": # https://github.com/IronLanguages/ironpython3/issues/52
+                    self.assertTrue(isinstance(got, int))
+                else:
+                    self.assertIs(type(got), int)
         for huge_n in 2**31-1, 2**31, 2**63-1, 2**63, 2**100, 10**100:
             self.assertEqual(round(8979323, huge_n), 8979323)
 
@@ -966,10 +972,13 @@ def test_round(self):
             x = random.randrange(-10000, 10000)
             got = round(x)
             self.assertEqual(got, x)
-            self.assertIs(type(got), int)
+            if sys.implementation.name == "ironpython": # https://github.com/IronLanguages/ironpython3/issues/52
+                self.assertTrue(isinstance(got, int))
+            else:
+                self.assertIs(type(got), int)
 
         # bad second argument
-        bad_exponents = ('brian', 2.0, 0j, None)
+        bad_exponents = ('brian', 2.0, 0j)
         for e in bad_exponents:
             self.assertRaises(TypeError, round, 3, e)
 

Tests/test_long_stdlib.py

@@ -0,0 +1,45 @@
+# Licensed to the .NET Foundation under one or more agreements.
+# The .NET Foundation licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information.
+
+##
+## Run selected tests from test_long from StdLib
+##
+
+import unittest
+import sys
+
+from iptest import run_test
+
+import test.test_long
+
+def load_tests(loader, standard_tests, pattern):
+    if sys.implementation.name == 'ironpython':
+        suite = unittest.TestSuite()
+        suite.addTest(test.test_long.LongTest('test__format__'))
+        suite.addTest(test.test_long.LongTest('test_access_to_nonexistent_digit_0'))
+        suite.addTest(test.test_long.LongTest('test_bit_length'))
+        suite.addTest(test.test_long.LongTest('test_bitop_identities'))
+        suite.addTest(test.test_long.LongTest('test_conversion'))
+        suite.addTest(unittest.expectedFailure(test.test_long.LongTest('test_correctly_rounded_true_division'))) # https://github.com/IronLanguages/ironpython3/issues/907
+        suite.addTest(test.test_long.LongTest('test_division'))
+        suite.addTest(unittest.expectedFailure(test.test_long.LongTest('test_float_conversion'))) # https://github.com/IronLanguages/ironpython3/issues/907
+        suite.addTest(test.test_long.LongTest('test_float_overflow'))
+        suite.addTest(test.test_long.LongTest('test_format'))
+        suite.addTest(test.test_long.LongTest('test_from_bytes'))
+        suite.addTest(test.test_long.LongTest('test_karatsuba'))
+        suite.addTest(test.test_long.LongTest('test_logs'))
+        suite.addTest(test.test_long.LongTest('test_long'))
+        suite.addTest(test.test_long.LongTest('test_mixed_compares'))
+        suite.addTest(test.test_long.LongTest('test_nan_inf'))
+        suite.addTest(test.test_long.LongTest('test_round'))
+        suite.addTest(test.test_long.LongTest('test_shift_bool'))
+        suite.addTest(unittest.expectedFailure(test.test_long.LongTest('test_small_ints'))) # https://github.com/IronLanguages/ironpython3/issues/975
+        suite.addTest(test.test_long.LongTest('test_to_bytes'))
+        suite.addTest(unittest.expectedFailure(test.test_long.LongTest('test_true_division'))) # https://github.com/IronLanguages/ironpython3/issues/907
+        return suite
+
+    else:
+        return loader.loadTestsFromModule(test.test_long, pattern)
+
+run_test(__name__)