Re-enable some tests (#1525)

slozier · web-flow · commit dd24a8b02874 · 2022-08-23T08:57:15.000-04:00
* Re-enable test_global

* Re-enable test_grp

* Re-enable test_uuid
diff --git a/Src/IronPython.Modules/_codecs.cs b/Src/IronPython.Modules/_codecs.cs
@@ -227,6 +227,20 @@ public static PythonTuple mbcs_encode(CodeContext/*!*/ context, [NotNone] string
 
         #endregion
 
+        #region OEM Functions
+
+        [SupportedOSPlatform("windows"), PythonHidden(PlatformsAttribute.PlatformFamily.Unix)]
+        public static PythonTuple oem_decode(CodeContext/*!*/ context, [NotNone] IBufferProtocol input, string? errors = null, bool final = false) {
+            using IPythonBuffer buffer = input.GetBuffer();
+            return DoDecode(context, "oem", StringOps.CodecsInfo.OemEncoding, buffer, errors).ToPythonTuple();
+        }
+
+        [SupportedOSPlatform("windows"), PythonHidden(PlatformsAttribute.PlatformFamily.Unix)]
+        public static PythonTuple oem_encode(CodeContext/*!*/ context, [NotNone] string input, string? errors = null)
+            => DoEncode(context, "oem", StringOps.CodecsInfo.OemEncoding, input, errors).ToPythonTuple();
+
+        #endregion
+
         #region Code Page Functions
 
         [SupportedOSPlatform("windows"), PythonHidden(PlatformsAttribute.PlatformFamily.Unix)]
diff --git a/Src/IronPython.Modules/grp.cs b/Src/IronPython.Modules/grp.cs
@@ -6,18 +6,19 @@
 
 using System;
 using System.Collections.Generic;
+using System.Numerics;
 using System.Runtime.InteropServices;
 
 using Microsoft.Scripting.Runtime;
 
 using IronPython.Runtime;
 using IronPython.Runtime.Operations;
-
-using System.Numerics;
+using IronPython.Runtime.Exceptions;
+using IronPython.Runtime.Types;
 
 [assembly: PythonModule("grp", typeof(IronPython.Modules.PythonGrp), PlatformsAttribute.PlatformFamily.Unix)]
 namespace IronPython.Modules {
-    
+
     public static class PythonGrp {
         public const string __doc__ = @"Access to the Unix group database.
         
@@ -79,13 +80,10 @@ private static struct_group Make(IntPtr pwd) {
             return new struct_group(g.gr_name, g.gr_passwd, g.gr_gid, new PythonList(MarshalStringArray(g.gr_mem)));
         }
 
-        private static IEnumerable<string> MarshalStringArray(IntPtr arrayPtr)
-        {
-            if (arrayPtr != IntPtr.Zero)
-            {
+        private static IEnumerable<string> MarshalStringArray(IntPtr arrayPtr) {
+            if (arrayPtr != IntPtr.Zero) {
                 IntPtr ptr = Marshal.ReadIntPtr(arrayPtr);
-                while (ptr != IntPtr.Zero)
-                {
+                while (ptr != IntPtr.Zero) {
                     string key = Marshal.PtrToStringAnsi(ptr);
                     yield return key;
                     arrayPtr = new IntPtr(arrayPtr.ToInt64() + IntPtr.Size);
@@ -96,16 +94,27 @@ private static IEnumerable<string> MarshalStringArray(IntPtr arrayPtr)
 
         public static struct_group getgrgid(int gid) {
             var grp = _getgrgid(gid);
-            if(grp == IntPtr.Zero) {
+            if (grp == IntPtr.Zero) {
                 throw PythonOps.KeyError($"getgrgid(): gid not found: {gid}");
             }
 
             return Make(grp);
         }
 
+        public static struct_group getgrgid(CodeContext context, object gid) {
+            var g = BigIntegerOps.__new__(context, TypeCache.BigInteger, gid);
+            PythonOps.Warn(context, PythonExceptions.DeprecationWarning, $"group id must be int, not {PythonOps.GetPythonTypeName(gid)}");
+            return g switch {
+                int i => getgrgid(i),
+                BigInteger bi => getgrgid((int)bi),
+                _ => throw new InvalidOperationException(),
+            };
+        }
+
         public static struct_group getgrnam(string name) {
+            if (name is not null && name.IndexOf((char)0) != -1) throw PythonOps.ValueError("embedded null byte");
             var grp = _getgrnam(name);
-            if(grp == IntPtr.Zero) {
+            if (grp == IntPtr.Zero) {
                 throw PythonOps.KeyError($"getgrnam()): name not found: {name}");
             }
 
@@ -116,31 +125,32 @@ public static PythonList getgrall() {
             var res = new PythonList();
             setgrent();
             IntPtr val = getgrent();
-            while(val != IntPtr.Zero) {
+            while (val != IntPtr.Zero) {
                 res.Add(Make(val));
                 val = getgrent();
             }
-            
+
             return res;
         }
 
 
         #region P/Invoke Declarations
 
-        [DllImport("libc", EntryPoint="getgrgid", CallingConvention=CallingConvention.Cdecl)]
+        [DllImport("libc", EntryPoint = "getgrgid", CallingConvention = CallingConvention.Cdecl)]
         private static extern IntPtr _getgrgid(int uid);
 
-        [DllImport("libc", EntryPoint="getgrnam", CallingConvention=CallingConvention.Cdecl)]
+        [DllImport("libc", EntryPoint = "getgrnam", CallingConvention = CallingConvention.Cdecl)]
         private static extern IntPtr _getgrnam([MarshalAs(UnmanagedType.LPStr)] string name);
 
-        [DllImport("libc", CallingConvention=CallingConvention.Cdecl)]
+        [DllImport("libc", CallingConvention = CallingConvention.Cdecl)]
         private static extern void setgrent();
 
-        [DllImport("libc", CallingConvention=CallingConvention.Cdecl)]
+        [DllImport("libc", CallingConvention = CallingConvention.Cdecl)]
         private static extern IntPtr getgrent();
 
         #endregion
 
     }
 }
+
 #endif
diff --git a/Src/IronPython/Runtime/Operations/StringOps.cs b/Src/IronPython/Runtime/Operations/StringOps.cs
@@ -1991,17 +1991,28 @@ private static string UserDecode(CodeContext context, PythonTuple codecInfo, obj
 
         internal static partial class CodecsInfo {
             internal static readonly Encoding MbcsEncoding;
+            internal static readonly Encoding OemEncoding;
             internal static readonly Encoding RawUnicodeEscapeEncoding = new UnicodeEscapeEncoding(raw: true);
             internal static readonly Encoding UnicodeEscapeEncoding = new UnicodeEscapeEncoding(raw: false);
             internal static readonly IDictionary<string, Lazy<Encoding?>> Codecs;
 
+            [DllImport(Interop.Libraries.Kernel32, ExactSpelling = true, CharSet = CharSet.Auto)]
+            private static extern int GetOEMCP();
+
             static CodecsInfo() {
 #if NETCOREAPP || NETSTANDARD
                 // This ensures that Encoding.GetEncoding(0) will return the default Windows ANSI code page
                 Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 #endif
-                // Use Encoding.GetEncoding(0) instead of Encoding.Default (which returns UTF-8 with .NET Core)
-                MbcsEncoding = Encoding.GetEncoding(0);
+
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
+                    // Use Encoding.GetEncoding(0) instead of Encoding.Default (which returns UTF-8 with .NET Core)
+                    MbcsEncoding = Encoding.GetEncoding(0);
+                    OemEncoding = Encoding.GetEncoding(GetOEMCP());
+                } else {
+                    MbcsEncoding = null!;
+                    OemEncoding = null!;
+                }
                 Codecs = MakeCodecsDict();
             }
 
@@ -2030,6 +2041,7 @@ static CodecsInfo() {
 
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
                     d["mbcs"] = makeEncodingProxy(() => MbcsEncoding);
+                    d["oem"] = makeEncodingProxy(() => OemEncoding);
                 }
 
                 // TODO: revisit the exceptions to rules below once _codecs_cn, _codecs_hk, _codecs_jp, and _codecs_kr are implemented
diff --git a/Src/IronPythonTest/Cases/CPythonCasesManifest.ini b/Src/IronPythonTest/Cases/CPythonCasesManifest.ini
@@ -1200,12 +1200,6 @@ Ignore=true # blocked by https://github.com/IronLanguages/ironpython3/issues/98
 [CPython.test_fileinput]
 Ignore=true # test_errors - https://github.com/IronLanguages/ironpython3/issues/1452
 
-[CPython.test_global]
-Ignore=true # AssertionError: 5 != 4
-
-[CPython.test_grp]
-Ignore=true # 2 failures
-
 [CPython.test_int]
 Ignore=true # blocked by https://github.com/IronLanguages/ironpython3/issues/105
 
@@ -1241,6 +1235,3 @@ Ignore=true # lots of failures
 
 [CPython.test_userlist]
 Ignore=true # test_free_after_iterating
-
-[CPython.test_uuid]
-Ignore=true # LookupError: unknown encoding: oem - https://github.com/IronLanguages/ironpython3/issues/1451
diff --git a/Src/StdLib/Lib/test/test_global.py b/Src/StdLib/Lib/test/test_global.py
@@ -24,15 +24,15 @@ def wrong1():
     global a
     global b
 """
-        check_syntax_error(self, prog_text_1, lineno=4, offset=4)
+        check_syntax_error(self, prog_text_1, lineno=4, offset=5)
 
     def test2(self):
         prog_text_2 = """\
 def wrong2():
     print(x)
     global x
 """
-        check_syntax_error(self, prog_text_2, lineno=3, offset=4)
+        check_syntax_error(self, prog_text_2, lineno=3, offset=5)
 
     def test3(self):
         prog_text_3 = """\
@@ -41,7 +41,7 @@ def wrong3():
     x = 2
     global x
 """
-        check_syntax_error(self, prog_text_3, lineno=4, offset=4)
+        check_syntax_error(self, prog_text_3, lineno=4, offset=5)
 
     def test4(self):
         prog_text_4 = """\
