From fa5127b97acdd780a631e90c05920f5ca0ff8be2 Mon Sep 17 00:00:00 2001
From: alex_hold <8038944+alex-hold@user.noreply.gitee.com>
Date: Mon, 2 Aug 2021 08:34:49 +0000
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81TDD=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E9=A9=B1=E5=8A=A8=E7=B1=BB=E5=9E=8B=E6=8C=87=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/xdevice/_core/executor/scheduler.py |  3 +++
 src/xdevice/_core/executor/source.py    | 30 +++++++++++++++++--------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/xdevice/_core/executor/scheduler.py b/src/xdevice/_core/executor/scheduler.py
index bd8d4f2..22deb97 100644
--- a/src/xdevice/_core/executor/scheduler.py
+++ b/src/xdevice/_core/executor/scheduler.py
@@ -61,6 +61,7 @@ from _core.executor.concurrent import QueueMonitorThread
 from _core.executor.source import TestSetSource
 from _core.executor.source import find_test_descriptors
 from _core.executor.source import find_testdict_descriptors
+from _core.executor.source import TestDictSource
 from _core.logger import platform_logger
 from _core.logger import add_task_file_handler
 from _core.logger import remove_task_file_handler
@@ -99,6 +100,7 @@ class Scheduler(object):
         task = Task(drivers=[])
         task.init(config)
 
+        TestDictSource.reset()
         root_descriptor = self._find_test_root_descriptor(task.config)
         task.set_root_descriptor(root_descriptor)
         return task
@@ -150,6 +152,7 @@ class Scheduler(object):
             LOG.exception(exception, exc_info=False, error_no=error_no)
 
         finally:
+            Scheduler._clear_test_dict_source()
             if getattr(task.config, ConfigConst.test_environment, "") or\
                     getattr(task.config, ConfigConst.configfile, ""):
                 self._restore_environment()
diff --git a/src/xdevice/_core/executor/source.py b/src/xdevice/_core/executor/source.py
index 3c0ad8b..eabbbc5 100644
--- a/src/xdevice/_core/executor/source.py
+++ b/src/xdevice/_core/executor/source.py
@@ -17,6 +17,8 @@
 #
 
 import os
+import json
+import copy
 from collections import namedtuple
 
 from _core.constants import DeviceTestType
@@ -30,7 +32,7 @@ from _core.utils import unique_id
 
 
 __all__ = ["TestSetSource", "TestSource", "find_test_descriptors",
-           "find_testdict_descriptors"]
+           "find_testdict_descriptors", "TestDictSource"]
 
 TestSetSource = namedtuple('TestSetSource', 'set')
 TestSource = namedtuple('TestSource', 'source_file source_string config_file '
@@ -51,6 +53,7 @@ EXT_TYPE_DICT = {".dex": DeviceTestType.dex_test,
 PY_SUFFIX = ".py"
 PYD_SUFFIX = ".pyd"
 MODULE_CONFIG_SUFFIX = ".json"
+MAX_DIR_DEPTH = 6
 LOG = platform_logger("TestSource")
 
 
@@ -116,8 +119,8 @@ def find_testdict_descriptors(config):
         for file_name in files:
             if not os.path.isabs(file_name):
                 file_name = os.path.join(Variables.exec_dir, file_name)
-            if os.path.isfile(
-                    file_name) and test_type_key in TEST_TYPE_DICT.keys():
+            if os.path.isfile(file_name) and test_type_key in \
+                    TestDictSource.test_type.keys():
                 desc = _make_test_descriptor(os.path.abspath(file_name),
                                              test_type_key)
                 if desc is not None:
@@ -248,7 +251,7 @@ def _make_test_descriptor(file_path, test_type_key):
     # get params
     filename, _ = get_filename_extension(file_path)
     uid = unique_id("TestSource", filename)
-    test_type = TEST_TYPE_DICT[test_type_key]
+    test_type = TestDictSource.test_type[test_type_key]
     config_file = _get_config_file(
         os.path.join(os.path.dirname(file_path), filename))
 
@@ -358,7 +361,7 @@ def _get_config_file(filename, ext=None, config=None):
 def _get_testcase_config_file(filename):
     depth = 1
     dirname = os.path.dirname(filename)
-    while dirname and depth < 6:
+    while dirname and depth < MAX_DIR_DEPTH:
         for item in os.listdir(dirname):
             item_path = os.path.join(dirname, item)
             if os.path.isfile(item_path) and item.endswith(
@@ -379,11 +382,10 @@ def _get_test_type(config_file, test_driver, ext):
                       error_no="00110")
             return ""
         return _get_test_driver(config_file)
-
     if ext in [".py", ".js", ".dex", ".hap", ".bin"] \
-            and ext in EXT_TYPE_DICT.keys():
-        test_type = EXT_TYPE_DICT[ext]
-    elif ext in EXT_TYPE_DICT.keys():
+            and ext in TestDictSource.exe_type.keys():
+        test_type = TestDictSource.exe_type[ext]
+    elif ext in TestDictSource.exe_type.keys():
         test_type = DeviceTestType.hap_test
     else:
         test_type = DeviceTestType.cpp_test
@@ -397,3 +399,13 @@ def _parse_module_name(config_file, file_name):
         if "{" in file_name:
             return "report"
         return file_name
+
+
+class TestDictSource:
+    exe_type = dict()
+    test_type = dict()
+
+    @classmethod
+    def reset(cls):
+        cls.test_type = copy.deepcopy(TEST_TYPE_DICT)
+        cls.exe_type = copy.deepcopy(EXT_TYPE_DICT)
-- 
GitLab