commit 24df0a5d1fb02a6c562cbea0d0ea86b76220fb65
author Alexandre Detiste <alexandre.detiste@gmail.com> Thu Jan 16 00:39:20 2025 +0100
committer Jens Geyer <Jens-G@users.noreply.github.com> Wed Feb 19 21:21:24 2025 +0100
tree 0ed61953e8c05da233fe75e59f32e58ecc31275e
parent 5903c721bfc97b60aed02e9521a881bc6d5b81db

test/crossrunner: merge in old Py2vs3 compat.py

test/crossrunner/test.py

diff --git a/test/crossrunner/test.py b/test/crossrunner/test.py
index 0e91284..2a1a4da 100644
--- a/test/crossrunner/test.py
+++ b/test/crossrunner/test.py
@@ -21,7 +21,6 @@
 import multiprocessing
 import os
 import sys
-from .compat import path_join
 from .util import merge_dict, domain_socket_path
 
 
@@ -50,7 +49,7 @@
     def _fix_cmd_path(self, cmd):
         # if the arg is a file in the current directory, make it path
         def abs_if_exists(arg):
-            p = path_join(self.workdir, arg)
+            p = os.path.join(self.workdir, arg)
             return p if os.path.exists(p) else arg
 
         if cmd[0] == 'python':
@@ -125,7 +124,7 @@
         if os.path.isabs(path):
             path = os.path.realpath(path)
         else:
-            path = os.path.realpath(path_join(self.testdir, path))
+            path = os.path.realpath(os.path.join(self.testdir, path))
         config.update({key: path})
         return config