diff --git a/util/test/rdtest/remoteserver.py b/util/test/rdtest/remoteserver.py index b5a202ace..affffa7b1 100644 --- a/util/test/rdtest/remoteserver.py +++ b/util/test/rdtest/remoteserver.py @@ -236,10 +236,10 @@ class AndroidRemoteServer(RemoteServer): def get_temp_path(self, name="", timeout=20): subprocess.run(['adb', '-s', self.device, 'shell', 'mkdir', '-p', - self._base_path + '/' + util.get_current_test()], + self._base_path + '/' + util.get_current_test_name()], timeout=timeout, check=True) - return self._base_path + util.get_current_test() + '/' + name + return self._base_path + util.get_current_test_name() + '/' + name def get_renderdoc_path(self): return self._data_path + '/' + AndroidRemoteServer.ADRD_SERVER_APP64 + '/files/RenderDoc/' diff --git a/util/test/rdtest/runner.py b/util/test/rdtest/runner.py index e51a68a5a..0d1eb01f7 100644 --- a/util/test/rdtest/runner.py +++ b/util/test/rdtest/runner.py @@ -1,4 +1,5 @@ from __future__ import annotations +import importlib import os import shutil import ctypes @@ -34,6 +35,16 @@ def get_tests(): return testcases +def get_test(name: str): + return next(filter(lambda t: t.__name__ == name, get_tests())) + +def reload_test(name: str): + importlib.reload(sys.modules[get_test(name).__module__]) + +def get_current_test() -> TestCaseType: + return get_test(util.get_current_test_name()) + + RUNNER_DEBUG = False # Debug test runner running by printing messages to track it diff --git a/util/test/rdtest/testcase.py b/util/test/rdtest/testcase.py index a52528d3d..e5ae41c50 100644 --- a/util/test/rdtest/testcase.py +++ b/util/test/rdtest/testcase.py @@ -296,7 +296,7 @@ class TestCase: """ if self.demos_test_name != '': - logfile = os.path.join(util.get_tmp_dir(), util.get_current_test(), 'demos.log') + logfile = os.path.join(util.get_tmp_dir(), util.get_current_test_name(), 'demos.log') remote_logfile = logfile exe = util.get_demos_binary() if util.get_remote_server() is not None: diff --git a/util/test/rdtest/util.py b/util/test/rdtest/util.py index fd9409dde..acff76a01 100644 --- a/util/test/rdtest/util.py +++ b/util/test/rdtest/util.py @@ -119,7 +119,7 @@ def create_adb_device(name: str): set_remote_server(server) -def get_current_test(): +def get_current_test_name(): return _test_name @@ -175,7 +175,7 @@ def get_demos_timeout(): def get_tmp_path(name: str, test = ""): if test == "": - test = get_current_test() + test = get_current_test_name() os.makedirs(os.path.join(_temp_dir, test), exist_ok=True) return os.path.join(_temp_dir, test, name)