fix: resolve all CI test failures for Python 3.11+ compatibility

Agent-Logs-Url: https://github.com/asfaltboy/SublimeTestPlier/sessions/1fd285bd-0c6a-4000-8a65-599b99bf602d

Co-authored-by: asfaltboy <321520+asfaltboy@users.noreply.github.com>

Author: Copilot

=7

@@ -8,10 +8,6 @@
 
 from . import utils
 
-MYPY = False
-if MYPY:
-    from typing import Optional
-
 
 class RunPythonTestsCommand(sublime_plugin.WindowCommand):
     external_runner = None
@@ -129,7 +125,10 @@ def get_command_kwargs(self, **addl_kwargs):
                 venv_bin_path = '%s/bin' % venv_path
                 kwargs['env']['PATH'] = venv_bin_path
         # merge path with Sublime's env PATH
-        kwargs['env']['PATH'] = '%s:%s' % (kwargs['env'].get('PATH', ''), os.environ["PATH"])
+        os_path = os.environ.get("PATH", "")
+        combined_path = ':'.join(p for p in [kwargs['env'].get('PATH', ''), os_path] if p)
+        if combined_path:
+            kwargs['env']['PATH'] = combined_path
         utils._log("Current PATH is %s" % os.getenv("PATH"))
 
         if 'working_dir' in kwargs:

python_test_plier.py

@@ -112,7 +112,10 @@ def parse(self, line):
 
     def should_stop(self, node):
         assert self.lineno, 'line number required'
-        if node.lineno > self.lineno:
+        first_lineno = node.lineno
+        if getattr(node, 'decorator_list', None):
+            first_lineno = node.decorator_list[0].lineno
+        if first_lineno > self.lineno:
             self._log("Stop parsing node lineno %s / our lineno %s" % (
                 node.lineno, self.lineno))
             return True

test_parser.py

@@ -1,4 +1,5 @@
 from unittest import TestCase, mock
+import os
 import sys
 
 from .sublime_mock import sublime, known_commands
@@ -43,6 +44,9 @@ def setUp(self):
         self.debug_patcher = mock.patch.object(utils, 'DEBUG', return_value=True)
         self.debug_patcher.start()
         self.addCleanup(self.debug_patcher.stop)
+        self.path_patcher = mock.patch.dict(os.environ, {'PATH': ''})
+        self.path_patcher.start()
+        self.addCleanup(self.path_patcher.stop)
 
     def tearDown(self):
         exec_cmd.reset_mock()
@@ -109,7 +113,8 @@ def test_custom_cmd_without_file(self):
         exec_cmd.assert_called_once_with(dict(
             working_dir='', env={}, cmd=['nosetests', '-k ']))
 
-    def test_custom_unittest_module_relative_to_project(self):
+    @mock.patch('os.listdir', return_value=[])
+    def test_custom_unittest_module_relative_to_project(self, listdir):
         self.view.file_name = mock.Mock(return_value='/SublimeTestPlier/tests/file.py')
         self.view.substr.return_value = self.mock_selection(2, 2)
         custom_kwargs = self.custom_kwargs.copy()
@@ -125,7 +130,8 @@ def test_custom_unittest_module_relative_to_project(self):
             working_dir='', env={},
             cmd=['unittest', 'tests.file.TestCase.test_fail', ]))
 
-    def test_custom_unittest_module_relative_to_working_dir(self):
+    @mock.patch('os.listdir', return_value=[])
+    def test_custom_unittest_module_relative_to_working_dir(self, listdir):
         self.view.file_name = mock.Mock(return_value='/SublimeTestPlier/tests/file.py')
         self.view.substr.return_value = self.mock_selection(2, 2)
         custom_kwargs = self.custom_kwargs.copy()