Ensure that codec tests are run (#1763)

filmor · web-flow · commit 090ff9f46001 · 2022-04-25T10:51:52.000+02:00
* Move test_codec.py to the right directory
* Call PyObjectConversions.Reset from Python via a proxy to keep it internal
* Sign Python.Test DLL and make Python.Runtime internals visible for it
diff --git a/src/runtime/Properties/AssemblyInfo.cs b/src/runtime/Properties/AssemblyInfo.cs
@@ -1,3 +1,5 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("Python.EmbeddingTest, PublicKey=00240000048000009400000006020000002400005253413100040000110000005ffd8f49fb44ab0641b3fd8d55e749f716e6dd901032295db641eb98ee46063cbe0d4a1d121ef0bc2af95f8a7438d7a80a3531316e6b75c2dae92fb05a99f03bf7e0c03980e1c3cfb74ba690aca2f3339ef329313bcc5dccced125a4ffdc4531dcef914602cd5878dc5fbb4d4c73ddfbc133f840231343e013762884d6143189")]
+
+[assembly: InternalsVisibleTo("Python.Test, PublicKey=00240000048000009400000006020000002400005253413100040000110000005ffd8f49fb44ab0641b3fd8d55e749f716e6dd901032295db641eb98ee46063cbe0d4a1d121ef0bc2af95f8a7438d7a80a3531316e6b75c2dae92fb05a99f03bf7e0c03980e1c3cfb74ba690aca2f3339ef329313bcc5dccced125a4ffdc4531dcef914602cd5878dc5fbb4d4c73ddfbc133f840231343e013762884d6143189")]
diff --git a/src/testing/CodecTest.cs b/src/testing/CodecTest.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Python.Runtime;
 
 namespace Python.Test
 {
@@ -44,4 +45,12 @@ public int GetLength2(IList<ListMember> o)
             return o.Count;
         }
     }
+
+    public static class CodecResetter
+    {
+        public static void Reset()
+        {
+            PyObjectConversions.Reset();
+        }
+    }
 }
diff --git a/src/testing/Python.Test.csproj b/src/testing/Python.Test.csproj
@@ -3,6 +3,8 @@
     <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\runtime\Python.Runtime.csproj" />
diff --git a/tests/test_codec.py b/tests/test_codec.py
@@ -1,49 +1,49 @@
-# -*- coding: utf-8 -*-
-
-"""Test conversions using codecs from client python code"""
-import clr
-import System
-import pytest
-import Python.Runtime
-from Python.Test import ListConversionTester, ListMember
-
-class int_iterable():
-    def __init__(self):
-        self.counter = 0
-    def __iter__(self):
-        return self
-    def __next__(self):
-        if self.counter == 3:
-            raise StopIteration
-        self.counter = self.counter + 1
-        return self.counter
+# -*- coding: utf-8 -*-
+
+"""Test conversions using codecs from client python code"""
+import clr
+import System
+import pytest
+import Python.Runtime
+from Python.Test import ListConversionTester, ListMember, CodecResetter
+
+class int_iterable():
+    def __init__(self):
+        self.counter = 0
+    def __iter__(self):
+        return self
+    def __next__(self):
+        if self.counter == 3:
+            raise StopIteration
+        self.counter = self.counter + 1
+        return self.counter
 
 class obj_iterable():
-    def __init__(self):
-        self.counter = 0
-    def __iter__(self):
-        return self
-    def __next__(self):
-        if self.counter == 3:
-            raise StopIteration
+    def __init__(self):
+        self.counter = 0
+    def __iter__(self):
+        return self
+    def __next__(self):
+        if self.counter == 3:
+            raise StopIteration
         self.counter = self.counter + 1
         return ListMember(self.counter, "Number " + str(self.counter))
-
-def test_iterable():
-    """Test that a python iterable can be passed into a function that takes an IEnumerable<object>"""
-
-    #Python.Runtime.Codecs.ListDecoder.Register()
-    #Python.Runtime.Codecs.SequenceDecoder.Register()
-    Python.Runtime.Codecs.IterableDecoder.Register()
+
+def test_iterable():
+    """Test that a python iterable can be passed into a function that takes an IEnumerable<object>"""
+
+    #Python.Runtime.Codecs.ListDecoder.Register()
+    #Python.Runtime.Codecs.SequenceDecoder.Register()
+    Python.Runtime.Codecs.IterableDecoder.Register()
     ob = ListConversionTester()
 
-    iterable = int_iterable()
+    iterable = int_iterable()
     assert 3 == ob.GetLength(iterable)
 
     iterable2 = obj_iterable()
     assert 3 == ob.GetLength2(iterable2)
 
-    Python.Runtime.PyObjectConversions.Reset()
+    CodecResetter.Reset()
 
 def test_sequence():
     Python.Runtime.Codecs.SequenceDecoder.Register()
@@ -55,7 +55,7 @@ def test_sequence():
     tup2 = (ListMember(1, "one"), ListMember(2, "two"), ListMember(3, "three"))
     assert 3 == ob.GetLength(tup2)
 
-    Python.Runtime.PyObjectConversions.Reset()
+    CodecResetter.Reset()
 
 def test_list():
     Python.Runtime.Codecs.SequenceDecoder.Register()
@@ -67,4 +67,4 @@ def test_list():
     l2 = [ListMember(1, "one"), ListMember(2, "two"), ListMember(3, "three")]
     assert 3 == ob.GetLength(l2)
 
-    Python.Runtime.PyObjectConversions.Reset()
+    CodecResetter.Reset()

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Text;`
	`5`	`+using Python.Runtime;`
`5`	`6`
`6`	`7`	`namespace Python.Test`
`7`	`8`	`{`
`@@ -44,4 +45,12 @@ public int GetLength2(IList<ListMember> o)`
`44`	`45`	`return o.Count;`
`45`	`46`	`}`
`46`	`47`	`}`
	`48`	`+`
	`49`	`+ public static class CodecResetter`
	`50`	`+ {`
	`51`	`+ public static void Reset()`
	`52`	`+ {`
	`53`	`+ PyObjectConversions.Reset();`
	`54`	`+ }`
	`55`	`+ }`
`47`	`56`	`}`