[GR-23295] Make test_enum pass

PullRequest: graalpython/1417

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_enum.txt

@@ -1,3 +1,4 @@
+*graalpython.lib-python.3.test.test_enum.MiscTestCase.test__all__
 *graalpython.lib-python.3.test.test_enum.TestEmptyAndNonLatinStrings.test_empty_string
 *graalpython.lib-python.3.test.test_enum.TestEmptyAndNonLatinStrings.test_non_latin_character_string
 *graalpython.lib-python.3.test.test_enum.TestEmptyAndNonLatinStrings.test_non_latin_number_string
@@ -79,6 +80,8 @@
 *graalpython.lib-python.3.test.test_enum.TestEnum.test_pickle_enum
 *graalpython.lib-python.3.test.test_enum.TestEnum.test_pickle_enum_function
 *graalpython.lib-python.3.test.test_enum.TestEnum.test_pickle_enum_function_with_module
+*graalpython.lib-python.3.test.test_enum.TestEnum.test_pickle_float
+*graalpython.lib-python.3.test.test_enum.TestEnum.test_pickle_int
 *graalpython.lib-python.3.test.test_enum.TestEnum.test_programmatic_function_from_dict
 *graalpython.lib-python.3.test.test_enum.TestEnum.test_programmatic_function_iterable
 *graalpython.lib-python.3.test.test_enum.TestEnum.test_programmatic_function_string
@@ -102,6 +105,7 @@
 *graalpython.lib-python.3.test.test_enum.TestEnum.test_subclasses_without_direct_pickle_support
 *graalpython.lib-python.3.test.test_enum.TestEnum.test_subclasses_without_direct_pickle_support_using_name
 *graalpython.lib-python.3.test.test_enum.TestEnum.test_subclassing
+*graalpython.lib-python.3.test.test_enum.TestEnum.test_tuple_subclass
 *graalpython.lib-python.3.test.test_enum.TestEnum.test_value_name
 *graalpython.lib-python.3.test.test_enum.TestEnum.test_wrong_enum_in_call
 *graalpython.lib-python.3.test.test_enum.TestEnum.test_wrong_enum_in_mixed_call
@@ -131,7 +135,10 @@
 *graalpython.lib-python.3.test.test_enum.TestHelpers.test_is_descriptor
 *graalpython.lib-python.3.test.test_enum.TestHelpers.test_is_dunder
 *graalpython.lib-python.3.test.test_enum.TestHelpers.test_is_sunder
+*graalpython.lib-python.3.test.test_enum.TestIntEnumConvert.test_convert
 *graalpython.lib-python.3.test.test_enum.TestIntEnumConvert.test_convert_raise
+*graalpython.lib-python.3.test.test_enum.TestIntEnumConvert.test_convert_value_lookup_priority
+*graalpython.lib-python.3.test.test_enum.TestIntEnumConvert.test_convert_warn
 *graalpython.lib-python.3.test.test_enum.TestIntFlag.test_and
 *graalpython.lib-python.3.test.test_enum.TestIntFlag.test_bool
 *graalpython.lib-python.3.test.test_enum.TestIntFlag.test_contains

graalpython/lib-python/3/test/test_enum.py

@@ -2970,19 +2970,21 @@ def test__all__(self):
 
 class TestIntEnumConvert(unittest.TestCase):
     def test_convert_value_lookup_priority(self):
+        # Graalpython change: the test hardcoded test module FQDN which is different under our runner, use __name__
         test_type = enum.IntEnum._convert_(
                 'UnittestConvert',
-                ('test.test_enum', '__main__')[__name__=='__main__'],
+                __name__,
                 filter=lambda x: x.startswith('CONVERT_TEST_'))
         # We don't want the reverse lookup value to vary when there are
         # multiple possible names for a given value.  It should always
         # report the first lexigraphical name in that case.
         self.assertEqual(test_type(5).name, 'CONVERT_TEST_NAME_A')
 
     def test_convert(self):
+        # Graalpython change: the test hardcoded test module FQDN which is different under our runner, use __name__
         test_type = enum.IntEnum._convert_(
                 'UnittestConvert',
-                ('test.test_enum', '__main__')[__name__=='__main__'],
+                __name__,
                 filter=lambda x: x.startswith('CONVERT_TEST_'))
         # Ensure that test_type has all of the desired names and values.
         self.assertEqual(test_type.CONVERT_TEST_NAME_F,
@@ -3000,9 +3002,10 @@ def test_convert(self):
                          '_convert was deprecated in 3.8')
     def test_convert_warn(self):
         with self.assertWarns(DeprecationWarning):
+            # Graalpython change: the test hardcoded test module FQDN which is different under our runner, use __name__
             enum.IntEnum._convert(
                 'UnittestConvert',
-                ('test.test_enum', '__main__')[__name__=='__main__'],
+                __name__,
                 filter=lambda x: x.startswith('CONVERT_TEST_'))
 
     @unittest.skipUnless(sys.version_info >= (3, 9),