1 files changed, 10 insertions, 39 deletions
diff --git a/sources/pyside6/tests/QtCore/qenum_test.py b/sources/pyside6/tests/QtCore/qenum_test.py
index aa9dfbb60..45a8e9124 100644
--- a/sources/pyside6/tests/QtCore/qenum_test.py
+++ b/sources/pyside6/tests/QtCore/qenum_test.py
@@ -19,21 +19,6 @@ from PySide6.QtCore import Qt, QIODevice, QObject, QEnum, QFlag
 
 
 class TestEnum(unittest.TestCase):
-
-    def testToInt(self):
-        self.assertEqual(QIODevice.NotOpen, 0)
-        self.assertEqual(QIODevice.ReadOnly, 1)
-        self.assertEqual(QIODevice.WriteOnly, 2)
-        self.assertEqual(QIODevice.ReadWrite, 1 | 2)
-        self.assertEqual(QIODevice.Append, 4)
-        self.assertEqual(QIODevice.Truncate, 8)
-        self.assertEqual(QIODevice.Text, 16)
-        self.assertEqual(QIODevice.Unbuffered, 32)
-
-    def testToIntInFunction(self):
-        self.assertEqual(str(int(QIODevice.WriteOnly)), "2")
-
-    @unittest.skipIf(sys.pyside63_option_python_enum, "makes no sense for tested Python enums")
     def testOperations(self):
         k = Qt.Key.Key_1
 
@@ -42,23 +27,6 @@ class TestEnum(unittest.TestCase):
         self.assertEqual(k - 2, -(2 - k))
         self.assertEqual(k * 2, 2 * k)
 
-        # Floats
-        with self.assertRaises(TypeError):
-            a = k + 2.0
-
-        with self.assertRaises(TypeError):
-            a = k - 2.0
-
-        with self.assertRaises(TypeError):
-            a = k * 2.0
-
-    @unittest.skipIf(sys.pyside63_option_python_enum, "inheritance forbidden for Python enums")
-    def testInherit(self):
-        class A(Qt.Key):
-            pass
-
-        self.assertEqual(A.Key_1, Qt.Key.Key_1)
-
     @unittest.skipUnless(getattr(sys, "getobjects", None), "requires --with-trace-refs")
     @unittest.skipUnless(getattr(sys, "gettotalrefcount", None), "requires --with-pydebug")
     def testEnumNew_NoLeak(self):
@@ -79,18 +47,20 @@ class TestEnum(unittest.TestCase):
 
 
 class TestQFlags(unittest.TestCase):
+
     def testToItn(self):
         om = QIODevice.NotOpen
+        omcmp = om.value
 
         self.assertEqual(om, QIODevice.NotOpen)
-        self.assertTrue(om == 0)
+        self.assertTrue(omcmp == 0)
 
-        self.assertTrue(om != QIODevice.ReadOnly)
-        self.assertTrue(om != 1)
+        self.assertTrue(omcmp != QIODevice.ReadOnly)
+        self.assertTrue(omcmp != 1)
 
     def testToIntInFunction(self):
         om = QIODevice.WriteOnly
-        self.assertEqual(int(om), 2)
+        self.assertEqual(int(om.value), 2)
 
     def testNonExtensibleEnums(self):
         try:
@@ -181,14 +151,15 @@ class SomeClass(QObject):
     QEnum(SomeEnum)     # works even without the decorator assignment
 
 
-@unittest.skipUnless(HAVE_ENUM, "requires 'enum' module (use 'pip install enum34' for Python 2)")
 class TestQEnumMacro(unittest.TestCase):
+    meta_name = "EnumType" if sys.version_info[:2] >= (3, 11) else "EnumMeta"
+
     def testTopLevel(self):
-        self.assertEqual(type(OuterEnum).__name__, "EnumMeta")
+        self.assertEqual(type(OuterEnum).__name__, self.meta_name)
         self.assertEqual(len(OuterEnum.__members__), 2)
 
     def testSomeClass(self):
-        self.assertEqual(type(SomeClass.SomeEnum).__name__, "EnumMeta")
+        self.assertEqual(type(SomeClass.SomeEnum).__name__, self.meta_name)
         self.assertEqual(len(SomeClass.SomeEnum.__members__), 3)
         with self.assertRaises(TypeError):
             int(SomeClass.SomeEnum.C) == 6