Skip to content

_load_from_testsuite 支持用例级别参数配置 #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xiongxiaoxx wants to merge 3 commits into
base: master
Choose a base branch
from
Open

_load_from_testsuite 支持用例级别参数配置 #155

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5ac5fc
_load_from_testsuite 支持用例级别参数配置
xiongxiaoxx Jul 13, 2023
bb9acb0
fix missing tests
xiongxiaoxx Jul 13, 2023
72abbb4
combine params
xiongxiaoxx Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions testbase/loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
"""
from __future__ import absolute_import

import copy
import imp
import itertools
import pkgutil
import os
import sys
Expand Down Expand Up @@ -292,11 +294,23 @@ def _load_from_module(
return tests

def _load_from_testsuite(
self, cls, data_key=None, exclude_data_key=None, attrs=None
self, cls, data_key=None, exclude_data_key=None, attrs=None, case_params=None
):
"""从测试用例套类加载测试用例"""

tests = []
for test in cls.testcases:
if case_params is None:
case_params = []

zip_longest = itertools.izip_longest if six.PY2 else itertools.zip_longest
for test, case_param in zip_longest(cls.testcases, case_params):
combind_param = {}
if attrs is not None:
combind_param = copy.deepcopy(attrs)
if case_param is not None:
combind_param.update(case_param)
combind_param = combind_param or None

if isinstance(test, str):
test = self._load(test)
if not isinstance(test, type):
Expand All @@ -305,21 +319,27 @@ def _load_from_testsuite(
test,
data_key,
exclude_data_key=exclude_data_key,
attrs=attrs,
attrs=combind_param,
ignore_testsuite=True,
)
else:
tests += self._load_from_module(
test,
data_key,
exclude_data_key=exclude_data_key,
attrs=attrs,
attrs=combind_param,
ignore_testsuite=True,
)
else:
tests += self._load_from_class(
test, data_key, exclude_data_key=exclude_data_key, attrs=attrs
)
if issubclass(test, TestSuite):
testcases = self._load_from_testsuite(
test, data_key, exclude_data_key=exclude_data_key, attrs=combind_param
)
tests += [test(testcases)]
else:
tests += self._load_from_class(
test, data_key, exclude_data_key=exclude_data_key, attrs=combind_param
)

return [it for it in tests if not cls.filter(it)]

Expand Down