mark tests

youknowone · youknowone · commit aba3029a2b57 · 2026-01-01T17:37:04.000+09:00
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
@@ -206,6 +206,7 @@ class SysModuleTest(unittest.TestCase):
     def tearDown(self):
         test.support.reap_children()
 
+    @unittest.expectedFailure  # TODO: RUSTPYTHON
     def test_exit(self):
         # call with two arguments
         self.assertRaises(TypeError, sys.exit, 42, 42)
@@ -1179,7 +1180,6 @@ def test_getallocatedblocks(self):
         c = sys.getallocatedblocks()
         self.assertIn(c, range(b - 50, b + 50))
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: False is not true
     def test_is_gil_enabled(self):
         if support.Py_GIL_DISABLED:
             self.assertIs(type(sys._is_gil_enabled()), bool)
@@ -1319,7 +1319,6 @@ def test_orig_argv(self):
         self.assertEqual(proc.stdout.rstrip().splitlines(), expected,
                          proc)
 
-    @unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: module 'sys' has no attribute 'stdlib_module_names'
     def test_module_names(self):
         self.assertIsInstance(sys.stdlib_module_names, frozenset)
         for name in sys.stdlib_module_names:
diff --git a/crates/vm/src/stdlib/sys.rs b/crates/vm/src/stdlib/sys.rs
@@ -600,20 +600,11 @@ mod sys {
     }
 
     #[pyfunction]
-<<<<<<< HEAD
     const fn _is_gil_enabled() -> bool {
         false // RustPython has no GIL (like free-threaded Python)
     }
 
     #[pyfunction]
-||||||| parent of 39b62a349 (Update `test_sys.py` from 3.13.11)
-=======
-    const fn _is_gil_enabled() -> bool {
-        false // We don't implement GIL
-    }
-
-    #[pyfunction]
->>>>>>> 39b62a349 (Update `test_sys.py` from 3.13.11)
     fn exit(code: OptionalArg<PyObjectRef>, vm: &VirtualMachine) -> PyResult {
         let code = code.unwrap_or_none(vm);
         Err(vm.new_exception(vm.ctx.exceptions.system_exit.to_owned(), vec![code]))
