diff --git a/tests/pytest/util/cases.py b/tests/pytest/util/cases.py index 4fa7901fc7..eee8809ad0 100644 --- a/tests/pytest/util/cases.py +++ b/tests/pytest/util/cases.py @@ -71,11 +71,7 @@ class TDCases: runNum = 0 for tmp in self.linuxCases: if tmp.name.find(fileName) != -1: - # get the last class name as the test case class name - class_names = [name for name, obj in inspect.getmembers(testModule, inspect.isclass)] - class_names = class_names[-1] - case_class = getattr(testModule, class_names) - case = case_class() + case = testModule.TDTestCase() case.init(conn, self._logSql, replicaVar) try: case.run() @@ -107,11 +103,7 @@ class TDCases: runNum = 0 for tmp in self.windowsCases: if tmp.name.find(fileName) != -1: - # get the last class name as the test case class name - class_names = [name for name, obj in inspect.getmembers(testModule, inspect.isclass)] - class_names = class_names[-1] - case_class = getattr(testModule, class_names) - case = case_class() + case = testModule.TDTestCase() case.init(conn, self._logSql,replicaVar) try: case.run() @@ -125,17 +117,12 @@ class TDCases: def runAllCluster(self): # TODO: load all cluster case module here - testModule = self.__dynamicLoadModule(fileName) runNum = 0 for tmp in self.clusterCases: if tmp.name.find(fileName) != -1: tdLog.notice("run cases like %s" % (fileName)) - # get the last class name as the test case class name - class_names = [name for name, obj in inspect.getmembers(testModule, inspect.isclass)] - class_names = class_names[-1] - case_class = getattr(testModule, class_names) - case = case_class() + case = testModule.TDTestCase() case.init() case.run() case.stop() @@ -151,11 +138,7 @@ class TDCases: for tmp in self.clusterCases: if tmp.name.find(fileName) != -1: tdLog.notice("run cases like %s" % (fileName)) - # get the last class name as the test case class name - class_names = [name for name, obj in inspect.getmembers(testModule, inspect.isclass)] - class_names = class_names[-1] - case_class = getattr(testModule, class_names) - case = case_class() + case = testModule.TDTestCase() case.init() case.run() case.stop()