diff --git a/meta/lib/oeqa/core/context.py b/meta/lib/oeqa/core/context.py index 9e38cddcfeb..7d7d9f3c5c8 100644 --- a/meta/lib/oeqa/core/context.py +++ b/meta/lib/oeqa/core/context.py @@ -47,6 +47,8 @@ class OETestContext: return modules def skipTests(self, skips): + if not skips: + return # Use unittest's skip support so that skipped tests, and the class # setup of skipped classes, don't run for test in self.suites: @@ -159,32 +161,33 @@ class OETestContextExecutor: return logger def _process_args(self, logger, args): - self.tc_kwargs = {} - self.tc_kwargs['init'] = {} - self.tc_kwargs['load'] = {} - self.tc_kwargs['run'] = {} - - self.tc_kwargs['init']['logger'] = self._setup_logger(logger, args) + self.logger = self._setup_logger(logger, args) if args.test_data_file: - self.tc_kwargs['init']['td'] = json.load( - open(args.test_data_file, "r")) + with open(args.test_data_file, "r") as f: + self.td = json.load(f) else: - self.tc_kwargs['init']['td'] = {} + self.td = {} + + # Any further arguments for the test context, for subclasses to add + self.context_args = {} # Run image specific TEST_SUITE like testimage.bbclass by default - test_suites = self.tc_kwargs['init']['td'].get("TEST_SUITES") + test_suites = self.td.get("TEST_SUITES") if test_suites: test_suites = test_suites.split() + self.modules_required = [] if args.run_tests: - self.tc_kwargs['load']['modules'] = args.run_tests - self.tc_kwargs['load']['modules_required'] = args.run_tests + self.modules = args.run_tests + self.modules_required = args.run_tests elif test_suites: - self.tc_kwargs['load']['modules'] = test_suites + self.modules = test_suites else: - self.tc_kwargs['load']['modules'] = [] + self.modules = [] + self.tags_filter = None - self.tc_kwargs['run']['skips'] = [] + self.processes = None + self.skips = [] self.module_paths = args.CASES_PATHS @@ -192,7 +195,7 @@ class OETestContextExecutor: return args.json_result_dir def _get_configuration(self): - td = self.tc_kwargs['init']['td'] + td = self.td configuration = {'TEST_TYPE': self.name, 'MACHINE': td.get("MACHINE"), 'DISTRO': td.get("DISTRO"), @@ -210,9 +213,10 @@ class OETestContextExecutor: def run(self, logger, args): self._process_args(logger, args) - self.tc = self._context_class(**self.tc_kwargs['init']) + self.tc = self._context_class(td=self.td, logger=self.logger, **self.context_args) try: - self.tc.loadTests(self.module_paths, **self.tc_kwargs['load']) + self.tc.loadTests(self.module_paths, modules=self.modules, + modules_required=self.modules_required, tags_filter=self.tags_filter) except OEQATestNotFound as ex: logger.error(ex) sys.exit(1) @@ -221,7 +225,7 @@ class OETestContextExecutor: rc = self.tc.listTests(args.list_tests) else: self._pre_run() - rc = self.tc.runTests(**self.tc_kwargs['run']) + rc = self.tc.runTests(processes=self.processes, skips=self.skips) json_result_dir = self._get_json_result_dir(args) if json_result_dir: diff --git a/meta/lib/oeqa/runtime/context.py b/meta/lib/oeqa/runtime/context.py index 0763fb25ac0..c507197d8d1 100644 --- a/meta/lib/oeqa/runtime/context.py +++ b/meta/lib/oeqa/runtime/context.py @@ -206,7 +206,7 @@ class OERuntimeTestContextExecutor(OETestContextExecutor): super()._process_args(logger, args) - td = self.tc_kwargs['init']['td'] + td = self.td target_kwargs = {} target_kwargs['machine'] = td.get("MACHINE") or None @@ -216,12 +216,12 @@ class OERuntimeTestContextExecutor(OETestContextExecutor): target_kwargs['serialcontrol_ps1'] = td.get("TEST_SERIALCONTROL_PS1") or None target_kwargs['serialcontrol_connect_timeout'] = td.get("TEST_SERIALCONTROL_CONNECT_TIMEOUT") or None - self.tc_kwargs['init']['target'] = \ + self.context_args['target'] = \ OERuntimeTestContextExecutor.getTarget(args.target_type, None, args.target_ip, args.server_ip, **target_kwargs) - self.tc_kwargs['init']['image_packages'] = \ + self.context_args['image_packages'] = \ OERuntimeTestContextExecutor.readPackagesManifest( args.packages_manifest) - self.tc_kwargs['init']['extract_dir'] = args.extract_dir + self.context_args['extract_dir'] = args.extract_dir _executor_class = OERuntimeTestContextExecutor diff --git a/meta/lib/oeqa/sdk/context.py b/meta/lib/oeqa/sdk/context.py index 6024554cac4..3e2a7cff00e 100644 --- a/meta/lib/oeqa/sdk/context.py +++ b/meta/lib/oeqa/sdk/context.py @@ -101,13 +101,13 @@ class OESDKTestContextExecutor(OETestContextExecutor): def _process_args(self, logger, args): super()._process_args(logger, args) - self.tc_kwargs['init']['sdk_dir'] = args.sdk_dir - self.tc_kwargs['init']['sdk_env'] = self.sdk_env - self.tc_kwargs['init']['target_pkg_manifest'] = \ + self.context_args['sdk_dir'] = args.sdk_dir + self.context_args['sdk_env'] = self.sdk_env + self.context_args['target_pkg_manifest'] = \ OESDKTestContextExecutor._load_manifest(args.target_manifest) - self.tc_kwargs['init']['host_pkg_manifest'] = \ + self.context_args['host_pkg_manifest'] = \ OESDKTestContextExecutor._load_manifest(args.host_manifest) - self.tc_kwargs['run']['processes'] = args.processes + self.processes = args.processes @staticmethod def _get_sdk_environs(sdk_dir): diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index aaae9574c94..49d9fc2cba1 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -262,16 +262,17 @@ class OESelftestTestContextExecutor(OETestContextExecutor): elif args.list_tests: args.list_tests = 'name' - self.tc_kwargs['init']['td'] = bbvars + self.td = bbvars builddir = os.environ.get("BUILDDIR") - self.tc_kwargs['init']['config_paths'] = {} - self.tc_kwargs['init']['config_paths']['testlayer_path'] = get_test_layer(bbvars["BBLAYERS"]) - self.tc_kwargs['init']['config_paths']['builddir'] = builddir - self.tc_kwargs['init']['config_paths']['localconf'] = os.path.join(builddir, "conf/local.conf") - self.tc_kwargs['init']['config_paths']['bblayers'] = os.path.join(builddir, "conf/bblayers.conf") - self.tc_kwargs['init']['newbuilddir'] = args.newbuilddir - self.tc_kwargs['init']['keep_builddir'] = args.keep_builddir + self.context_args['config_paths'] = { + 'testlayer_path': get_test_layer(bbvars["BBLAYERS"]), + 'builddir': builddir, + 'localconf': os.path.join(builddir, "conf/local.conf"), + 'bblayers': os.path.join(builddir, "conf/bblayers.conf"), + } + self.context_args['newbuilddir'] = args.newbuilddir + self.context_args['keep_builddir'] = args.keep_builddir def tag_filter(tags): if args.exclude_tags: @@ -283,10 +284,10 @@ class OESelftestTestContextExecutor(OETestContextExecutor): return False if args.select_tags or args.exclude_tags: - self.tc_kwargs['load']['tags_filter'] = tag_filter + self.tags_filter = tag_filter - self.tc_kwargs['run']['skips'] = args.skips - self.tc_kwargs['run']['processes'] = args.processes + self.skips = args.skips + self.processes = args.processes def _pre_run(self): def _check_required_env_variables(vars): @@ -381,12 +382,12 @@ class OESelftestTestContextExecutor(OETestContextExecutor): return '%s_%s_%s_%s' % (configuration['TEST_TYPE'], configuration['HOST_DISTRO'], configuration['MACHINE'], configuration['STARTTIME']) def _internal_run(self, logger, args): - self.module_paths = self._get_cases_paths( - self.tc_kwargs['init']['td']['BBPATH'].split(':')) + self.module_paths = self._get_cases_paths(self.td['BBPATH'].split(':')) - self.tc = self._context_class(**self.tc_kwargs['init']) + self.tc = self._context_class(td=self.td, logger=self.logger, **self.context_args) try: - self.tc.loadTests(self.module_paths, **self.tc_kwargs['load']) + self.tc.loadTests(self.module_paths, modules=self.modules, + modules_required=self.modules_required, tags_filter=self.tags_filter) except OEQATestNotFound as ex: logger.error(ex) sys.exit(1) @@ -395,7 +396,7 @@ class OESelftestTestContextExecutor(OETestContextExecutor): rc = self.tc.listTests(args.list_tests) else: self._pre_run() - rc = self.tc.runTests(**self.tc_kwargs['run']) + rc = self.tc.runTests(processes=self.processes, skips=self.skips) configuration = self.get_configuration(args) rc.logDetails(self.get_json_result_dir(args), configuration,