From b969ba5b3069aa57795fd2ee36e30a698cd89ea3 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Thu, 18 Jan 2018 12:04:43 +0100 Subject: [PATCH 1/4] Add support for static linters Signed-off-by: Petr "Stone" Hracek --- moduleframework/common.py | 1 + moduleframework/mtf_scheduler.py | 10 +++ moduleframework/tools/dockerlint.py | 78 ----------------- .../tools/static_dockerfile_checks.py | 85 +++++++++++++++++++ 4 files changed, 96 insertions(+), 78 deletions(-) create mode 100644 moduleframework/tools/static_dockerfile_checks.py diff --git a/moduleframework/common.py b/moduleframework/common.py index c3e0d25..40ee17f 100644 --- a/moduleframework/common.py +++ b/moduleframework/common.py @@ -91,6 +91,7 @@ MODULE_DEFAULT_PROFILE = "default" TRUE_VALUES_DICT = ['yes', 'YES', 'yes', 'True', 'true', 'ok', 'OK'] OPENSHIFT_INIT_WAIT = 50 +STATIC_CHECKS = ['static_dockerfiule_checks', 'helpmd_lint'] def generate_unique_name(size=10): return ''.join(random.choice(string.ascii_lowercase) for _ in range(size)) diff --git a/moduleframework/mtf_scheduler.py b/moduleframework/mtf_scheduler.py index 02c7c5a..bbc4018 100755 --- a/moduleframework/mtf_scheduler.py +++ b/moduleframework/mtf_scheduler.py @@ -84,6 +84,8 @@ def mtfparser(): ) parser.add_argument("--linter", "-l", action="store_true", default=False, help='adds additional compose checks') + parser.add_argument("--static-linters", action="store_true", + default=False, help='adds static linters checks, like dockerfile and helpmdfile') parser.add_argument("--setup", action="store_true", default=False, help='Setup by mtfenvset') parser.add_argument("--action", action="store", default='run', @@ -194,6 +196,11 @@ class AvocadoStart(object): def __init__(self, args, unknown): # choose between TESTS and ADDITIONAL ENVIRONMENT from options + if args.static_linters: + for test in common.STATIC_CHECKS: + self.tests.append("{MTF_TOOLS}/{test}.py".format( + MTF_TOOLS=metadata_common.MetadataLoaderMTF.MTF_LINTER_PATH, + test=test)) if args.linter: self.tests += glob.glob("{MTF_TOOLS}/*.py".format( MTF_TOOLS=metadata_common.MetadataLoaderMTF.MTF_LINTER_PATH)) @@ -230,6 +237,9 @@ def avocado_run(self): def avocado_general(self, avocado_default_args=[]): # additional parameters # self.additionalAvocadoArg: its from cmd line, whats unknown to this tool + if self.args.static_linters and self.args.linter: + common.print_info("--static-linters and --linter can not be used together") + return 0 avocadoAction = [self.AVOCADO, self.args.action] + avocado_default_args rc=0 try: diff --git a/moduleframework/tools/dockerlint.py b/moduleframework/tools/dockerlint.py index 66dca7e..cb6824e 100644 --- a/moduleframework/tools/dockerlint.py +++ b/moduleframework/tools/dockerlint.py @@ -28,84 +28,6 @@ from moduleframework.avocado_testers import container_avocado_test -class DockerInstructionsTests(module_framework.AvocadoTest): - """ - :avocado: enable - :avocado: tags=sanity,rhel,fedora,docker,docker_instruction_test - - """ - - dp = None - - def setUp(self): - # it is not intended just for docker, but just docker packages are - # actually properly signed - self.dp = dockerlinter.DockerfileLinter() - if self.dp.dockerfile is None: - self.skip("Dockerfile was not found") - - def tearDown(self, *args, **kwargs): - pass - - def test_from_is_first_directive(self): - self.assertTrue(self.dp.check_from_is_first()) - - def test_from_directive_is_valid(self): - self.assertTrue(self.dp.check_from_directive_is_valid()) - - def test_chained_run_dnf_commands(self): - self.assertTrue(self.dp.check_chained_run_dnf_commands()) - - def test_chained_run_rest_commands(self): - self.assertTrue(self.dp.check_chained_run_rest_commands()) - - def test_helpmd_is_present(self): - self.assert_to_warn(self.assertTrue, self.dp.check_helpmd_is_present()) - - -class DockerLabelsTests(DockerInstructionsTests): - """ - :avocado: enable - :avocado: tags=sanity,rhel,fedora,docker,docker_labels_test - - """ - - def _test_for_env_and_label(self, docker_env, docker_label, env=True): - label_found = True - if env: - label = self.dp.get_docker_specific_env(docker_env) - else: - label = self.dp.get_specific_label(docker_env) - if not label: - label_found = self.dp.get_specific_label(docker_label) - return label_found - - def test_architecture_in_env_and_label_exists(self): - self.assertTrue(self.dp.get_specific_label("architecture")) - - def test_name_in_env_and_label_exists(self): - self.assertTrue(self.dp.get_docker_specific_env("NAME=")) - self.assertTrue(self.dp.get_specific_label("name")) - - def test_maintainer_label_exists(self): - self.assertTrue(self.dp.get_specific_label("maintainer")) - - def test_release_label_exists(self): - self.assertTrue(self.dp.get_specific_label("release")) - - def test_version_label_exists(self): - self.assertTrue(self.dp.get_specific_label("version")) - - def test_com_redhat_component_label_exists(self): - self.assertTrue(self.dp.get_specific_label("com.redhat.component")) - - def test_summary_label_exists(self): - self.assertTrue(self.dp.get_specific_label("summary")) - - def test_run_or_usage_label_exists(self): - self.assertTrue(self._test_for_env_and_label("run", "usage", env=False)) - - class DockerfileLinterInContainer(container_avocado_test.ContainerAvocadoTest): """ :avocado: enable diff --git a/moduleframework/tools/static_dockerfile_checks.py b/moduleframework/tools/static_dockerfile_checks.py new file mode 100644 index 0000000..820f4ad --- /dev/null +++ b/moduleframework/tools/static_dockerfile_checks.py @@ -0,0 +1,85 @@ +from __future__ import print_function + +import os +from avocado import Test +from moduleframework import module_framework +from moduleframework import dockerlinter + +class DockerInstructionsTests(module_framework.AvocadoTest): + """ + :avocado: enable + :avocado: tags=sanity,rhel,fedora,docker,docker_instruction_test + + """ + + dp = None + + def setUp(self): + # it is not intended just for docker, but just docker packages are + # actually properly signed + self.dp = dockerlinter.DockerfileLinter() + if self.dp.dockerfile is None: + self.skip("Dockerfile was not found") + + def tearDown(self, *args, **kwargs): + pass + + def test_from_is_first_directive(self): + self.assertTrue(self.dp.check_from_is_first()) + + def test_from_directive_is_valid(self): + self.assertTrue(self.dp.check_from_directive_is_valid()) + + def test_chained_run_dnf_commands(self): + self.assertTrue(self.dp.check_chained_run_dnf_commands()) + + def test_chained_run_rest_commands(self): + self.assertTrue(self.dp.check_chained_run_rest_commands()) + + def test_helpmd_is_present(self): + self.assert_to_warn(self.assertTrue, self.dp.check_helpmd_is_present()) + + +class DockerLabelsTests(DockerInstructionsTests): + """ + :avocado: enable + :avocado: tags=sanity,rhel,fedora,docker,docker_labels_test + + """ + + def _test_for_env_and_label(self, docker_env, docker_label, env=True): + label_found = True + if env: + label = self.dp.get_docker_specific_env(docker_env) + else: + label = self.dp.get_specific_label(docker_env) + if not label: + label_found = self.dp.get_specific_label(docker_label) + return label_found + + def test_architecture_in_env_and_label_exists(self): + self.assertTrue(self.dp.get_specific_label("architecture")) + + def test_name_in_env_and_label_exists(self): + self.assertTrue(self.dp.get_docker_specific_env("NAME=")) + self.assertTrue(self.dp.get_specific_label("name")) + + def test_maintainer_label_exists(self): + self.assertTrue(self.dp.get_specific_label("maintainer")) + + def test_release_label_exists(self): + self.assertTrue(self.dp.get_specific_label("release")) + + def test_version_label_exists(self): + self.assertTrue(self.dp.get_specific_label("version")) + + def test_com_redhat_component_label_exists(self): + self.assertTrue(self.dp.get_specific_label("com.redhat.component")) + + def test_summary_label_exists(self): + self.assertTrue(self.dp.get_specific_label("summary")) + + def test_run_or_usage_label_exists(self): + self.assertTrue(self._test_for_env_and_label("run", "usage", env=False)) + + From bcdf4df7d0a4a887a7535bcd5eea7c50c290eae4 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Thu, 18 Jan 2018 15:09:42 +0100 Subject: [PATCH 2/4] Rename tools -> test and create two directories inside generic and static Signed-off-by: Petr "Stone" Hracek --- MANIFEST.in | 2 +- docs/user_guide/index.rst | 2 +- docs/user_guide/scheduling.rst | 2 +- examples/testing-module/Makefile | 2 +- moduleframework/common.py | 3 ++- moduleframework/mtf_scheduler.py | 13 +++++-------- moduleframework/{tools => tests}/__init__.py | 0 .../{tools => tests/generic}/check_compose.py | 0 .../{tools => tests/generic}/dockerlint.py | 0 .../{tools => tests/generic}/modulelint.py | 0 .../{tools => tests/generic}/rpmvalidation.py | 0 .../static/dockerfile_lint.py} | 3 --- .../{tools => tests/static}/helpmd_lint.py | 0 mtf/metadata/tmet/common.py | 4 ++-- setup.py | 4 ++-- tools/mtf_modulelint.py | 10 ++++++---- 16 files changed, 21 insertions(+), 24 deletions(-) rename moduleframework/{tools => tests}/__init__.py (100%) rename moduleframework/{tools => tests/generic}/check_compose.py (100%) rename moduleframework/{tools => tests/generic}/dockerlint.py (100%) rename moduleframework/{tools => tests/generic}/modulelint.py (100%) rename moduleframework/{tools => tests/generic}/rpmvalidation.py (100%) rename moduleframework/{tools/static_dockerfile_checks.py => tests/static/dockerfile_lint.py} (97%) rename moduleframework/{tools => tests/static}/helpmd_lint.py (100%) diff --git a/MANIFEST.in b/MANIFEST.in index d380ac3..8d345d0 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -8,7 +8,7 @@ include requirements.txt recursive-include moduleframework * recursive-include docs * recursive-include examples * -recursive-include tools * +recursive-include tests * recursive-include distro * recursive-include man * recursive-include build_manpages *.py diff --git a/docs/user_guide/index.rst b/docs/user_guide/index.rst index 7260f41..0b12c68 100644 --- a/docs/user_guide/index.rst +++ b/docs/user_guide/index.rst @@ -24,7 +24,7 @@ User Guide .. code-block:: makefile - MODULE_LINT=/usr/share/moduleframework/tools/modulelint/*.py + MODULE_LINT=/usr/share/moduleframework/tests/generic/*.py TESTS=*.py CMD=avocado run $(MODULE_LINT) $(TESTS) diff --git a/docs/user_guide/scheduling.rst b/docs/user_guide/scheduling.rst index 6efd879..c7a5185 100644 --- a/docs/user_guide/scheduling.rst +++ b/docs/user_guide/scheduling.rst @@ -32,7 +32,7 @@ Taskotron Wokflow - checkout to proper version found by PDC (scmurl) - Try to find tests there ( if exist `Makefile` in `tests` directory) - If None: Try to find module dir in MTF project tests in `/usr/share/moduleframework/examples` directory - - If None: Run at least general ModuleLinter (`/usr/share/moduleframework/tools/modulelint`) with general minimal config.yaml located in `docs` directory + - If None: Run at least general ModuleLinter (`/usr/share/moduleframework/tests/modulelint`) with general minimal config.yaml located in `docs` directory Arbitrary Jenkins Instance ---------------------------- diff --git a/examples/testing-module/Makefile b/examples/testing-module/Makefile index d3d3e2b..2cafec3 100644 --- a/examples/testing-module/Makefile +++ b/examples/testing-module/Makefile @@ -1,5 +1,5 @@ CMD=mtf -TESTS=$(shell ls *.py *.sh ../../moduleframework/tools/*.py) +TESTS=$(shell ls *.py *.sh ../../moduleframework/tests/generic/*.py ../../moduleframework/tests/static/*.py) SIMPLE=simpleTest.py export MTF_REMOTE_REPOS=yes export DEBUG=yes diff --git a/moduleframework/common.py b/moduleframework/common.py index 40ee17f..bc960b0 100644 --- a/moduleframework/common.py +++ b/moduleframework/common.py @@ -91,7 +91,8 @@ MODULE_DEFAULT_PROFILE = "default" TRUE_VALUES_DICT = ['yes', 'YES', 'yes', 'True', 'true', 'ok', 'OK'] OPENSHIFT_INIT_WAIT = 50 -STATIC_CHECKS = ['static_dockerfiule_checks', 'helpmd_lint'] +STATIC_LINTERS = 'static' +GENERIC_TEST = 'generic' def generate_unique_name(size=10): return ''.join(random.choice(string.ascii_lowercase) for _ in range(size)) diff --git a/moduleframework/mtf_scheduler.py b/moduleframework/mtf_scheduler.py index bbc4018..d46b02e 100755 --- a/moduleframework/mtf_scheduler.py +++ b/moduleframework/mtf_scheduler.py @@ -197,13 +197,13 @@ class AvocadoStart(object): def __init__(self, args, unknown): # choose between TESTS and ADDITIONAL ENVIRONMENT from options if args.static_linters: - for test in common.STATIC_CHECKS: - self.tests.append("{MTF_TOOLS}/{test}.py".format( + self.tests += glob.glob("{MTF_TOOLS}/{STATIC_LINTERS}/*.py".format( MTF_TOOLS=metadata_common.MetadataLoaderMTF.MTF_LINTER_PATH, - test=test)) + STATIC_LINTERS=common.STATIC_LINTERS)) if args.linter: - self.tests += glob.glob("{MTF_TOOLS}/*.py".format( - MTF_TOOLS=metadata_common.MetadataLoaderMTF.MTF_LINTER_PATH)) + self.tests += glob.glob("{MTF_TOOLS}/{GENERIC_TEST}/*.py".format( + MTF_TOOLS=metadata_common.MetadataLoaderMTF.MTF_LINTER_PATH, + GENERIC_TEST=common.GENERIC_TEST)) self.args = args for param in unknown: @@ -237,9 +237,6 @@ def avocado_run(self): def avocado_general(self, avocado_default_args=[]): # additional parameters # self.additionalAvocadoArg: its from cmd line, whats unknown to this tool - if self.args.static_linters and self.args.linter: - common.print_info("--static-linters and --linter can not be used together") - return 0 avocadoAction = [self.AVOCADO, self.args.action] + avocado_default_args rc=0 try: diff --git a/moduleframework/tools/__init__.py b/moduleframework/tests/__init__.py similarity index 100% rename from moduleframework/tools/__init__.py rename to moduleframework/tests/__init__.py diff --git a/moduleframework/tools/check_compose.py b/moduleframework/tests/generic/check_compose.py similarity index 100% rename from moduleframework/tools/check_compose.py rename to moduleframework/tests/generic/check_compose.py diff --git a/moduleframework/tools/dockerlint.py b/moduleframework/tests/generic/dockerlint.py similarity index 100% rename from moduleframework/tools/dockerlint.py rename to moduleframework/tests/generic/dockerlint.py diff --git a/moduleframework/tools/modulelint.py b/moduleframework/tests/generic/modulelint.py similarity index 100% rename from moduleframework/tools/modulelint.py rename to moduleframework/tests/generic/modulelint.py diff --git a/moduleframework/tools/rpmvalidation.py b/moduleframework/tests/generic/rpmvalidation.py similarity index 100% rename from moduleframework/tools/rpmvalidation.py rename to moduleframework/tests/generic/rpmvalidation.py diff --git a/moduleframework/tools/static_dockerfile_checks.py b/moduleframework/tests/static/dockerfile_lint.py similarity index 97% rename from moduleframework/tools/static_dockerfile_checks.py rename to moduleframework/tests/static/dockerfile_lint.py index 820f4ad..2e14a4b 100644 --- a/moduleframework/tools/static_dockerfile_checks.py +++ b/moduleframework/tests/static/dockerfile_lint.py @@ -21,9 +21,6 @@ def setUp(self): if self.dp.dockerfile is None: self.skip("Dockerfile was not found") - def tearDown(self, *args, **kwargs): - pass - def test_from_is_first_directive(self): self.assertTrue(self.dp.check_from_is_first()) diff --git a/moduleframework/tools/helpmd_lint.py b/moduleframework/tests/static/helpmd_lint.py similarity index 100% rename from moduleframework/tools/helpmd_lint.py rename to moduleframework/tests/static/helpmd_lint.py diff --git a/mtf/metadata/tmet/common.py b/mtf/metadata/tmet/common.py index 912ffe1..08bfd9d 100644 --- a/mtf/metadata/tmet/common.py +++ b/mtf/metadata/tmet/common.py @@ -365,8 +365,8 @@ class MetadataLoaderMTF(MetadataLoader): metadata specific class for MTF (avocado) tests """ try: - import moduleframework.tools - MTF_LINTER_PATH = os.path.dirname(moduleframework.tools.__file__) + import moduleframework.tests + MTF_LINTER_PATH = os.path.dirname(moduleframework.tests.__file__) except: warn("MTF library not installed, linters are ignored") MTF_LINTER_PATH = None diff --git a/setup.py b/setup.py index 687469d..462f43e 100755 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ def get_dir(system_path=None, virtual_path=None): data_files = {} -paths = ['docs', 'examples', 'tools'] +paths = ['docs', 'examples', 'tests'] for path in paths: for root, dirs, files in os.walk(path, followlinks=True): @@ -77,7 +77,7 @@ def get_dir(system_path=None, virtual_path=None): author_email='jscotka@redhat.com', url='https://github.com/fedora-modularity/meta-test-family', license='GPLv2+', - packages=find_packages(exclude=['docs', 'examples', 'tools']), + packages=find_packages(exclude=['docs', 'examples', 'tests']), include_package_data=True, data_files=data_files.items(), scripts=[], diff --git a/tools/mtf_modulelint.py b/tools/mtf_modulelint.py index 844ea37..0957452 100755 --- a/tools/mtf_modulelint.py +++ b/tools/mtf_modulelint.py @@ -27,9 +27,11 @@ # TODO: This is not working now, because it is still not implemented in upsteram avocado: # TODO: https://github.com/avocado-framework/avocado/issues/1792 -from moduleframework.tools.check_compose import ComposeTest -from moduleframework.tools.rpmvalidation import rpmvalidation -from moduleframework.tools.modulelint import * +from moduleframework.tests.generic.check_compose import ComposeTest +from moduleframework.tests.generic.rpmvalidation import rpmvalidation +from moduleframework.tests.generic.modulelint import * +from moduleframework.tests.generic.dockerlint import * +from moduleframework.tests.static.dockerfile_lint import * class MTFComposeTest(ComposeTest): """ @@ -45,7 +47,7 @@ class MTFRpmValidation(rpmvalidation): pass -class MTFDockerFileLinter(DockerFileLinter): +class MTFDockerFileLinter(DockerfileLinterInContainer): """ :avocado: recursive """ From eda5749a45f11011ebf7ae6db9a943298dcd5278 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Thu, 18 Jan 2018 16:08:29 +0100 Subject: [PATCH 3/4] Fix mtf/metadata test Signed-off-by: Petr "Stone" Hracek --- mtf/metadata/tmet/common.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mtf/metadata/tmet/common.py b/mtf/metadata/tmet/common.py index 08bfd9d..2b17740 100644 --- a/mtf/metadata/tmet/common.py +++ b/mtf/metadata/tmet/common.py @@ -396,7 +396,8 @@ def _import_tests(self, testglob, pathlenght=0): def _import_linters(self): if self.MTF_LINTER_PATH: - self._import_tests(os.path.join(self.MTF_LINTER_PATH, "*.py"), pathlenght=-3) + self._import_tests(os.path.join(self.MTF_LINTER_PATH, "generic", "*.py"), pathlenght=-3) + self._import_tests(os.path.join(self.MTF_LINTER_PATH, "static", "*.py"), pathlenght=-3) def __avcado_tag_args(self, tag_list, defaultparam="--filter-by-tags-include-empty"): output = [] From 23b7ecab67362ad2077608fe2e17305789836d25 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Tue, 23 Jan 2018 15:23:05 +0100 Subject: [PATCH 4/4] remove option --static-linters and use tag Signed-off-by: Petr "Stone" Hracek --- moduleframework/mtf_scheduler.py | 9 +++------ moduleframework/tests/generic/check_compose.py | 2 +- moduleframework/tests/generic/dockerlint.py | 2 +- moduleframework/tests/generic/modulelint.py | 2 +- moduleframework/tests/generic/rpmvalidation.py | 2 +- moduleframework/tests/static/dockerfile_lint.py | 2 +- moduleframework/tests/static/helpmd_lint.py | 2 +- 7 files changed, 9 insertions(+), 12 deletions(-) diff --git a/moduleframework/mtf_scheduler.py b/moduleframework/mtf_scheduler.py index d46b02e..8ef951a 100755 --- a/moduleframework/mtf_scheduler.py +++ b/moduleframework/mtf_scheduler.py @@ -84,8 +84,6 @@ def mtfparser(): ) parser.add_argument("--linter", "-l", action="store_true", default=False, help='adds additional compose checks') - parser.add_argument("--static-linters", action="store_true", - default=False, help='adds static linters checks, like dockerfile and helpmdfile') parser.add_argument("--setup", action="store_true", default=False, help='Setup by mtfenvset') parser.add_argument("--action", action="store", default='run', @@ -196,14 +194,13 @@ class AvocadoStart(object): def __init__(self, args, unknown): # choose between TESTS and ADDITIONAL ENVIRONMENT from options - if args.static_linters: - self.tests += glob.glob("{MTF_TOOLS}/{STATIC_LINTERS}/*.py".format( - MTF_TOOLS=metadata_common.MetadataLoaderMTF.MTF_LINTER_PATH, - STATIC_LINTERS=common.STATIC_LINTERS)) if args.linter: self.tests += glob.glob("{MTF_TOOLS}/{GENERIC_TEST}/*.py".format( MTF_TOOLS=metadata_common.MetadataLoaderMTF.MTF_LINTER_PATH, GENERIC_TEST=common.GENERIC_TEST)) + self.tests += glob.glob("{MTF_TOOLS}/{STATIC_LINTERS}/*.py".format( + MTF_TOOLS=metadata_common.MetadataLoaderMTF.MTF_LINTER_PATH, + STATIC_LINTERS=common.STATIC_LINTERS)) self.args = args for param in unknown: diff --git a/moduleframework/tests/generic/check_compose.py b/moduleframework/tests/generic/check_compose.py index 26773f5..d57b6d0 100644 --- a/moduleframework/tests/generic/check_compose.py +++ b/moduleframework/tests/generic/check_compose.py @@ -33,7 +33,7 @@ class ComposeTest(module_framework.NspawnAvocadoTest): Validate overall module compose. :avocado: enable - :avocado: tags=sanity,rhel,fedora,compose_test,module + :avocado: tags=sanity,rhel,fedora,compose_test,module,generic """ def test_component_profile_installability(self): diff --git a/moduleframework/tests/generic/dockerlint.py b/moduleframework/tests/generic/dockerlint.py index cb6824e..68f3a66 100644 --- a/moduleframework/tests/generic/dockerlint.py +++ b/moduleframework/tests/generic/dockerlint.py @@ -31,7 +31,7 @@ class DockerfileLinterInContainer(container_avocado_test.ContainerAvocadoTest): """ :avocado: enable - :avocado: tags=sanity,rhel,fedora,docker,docker_lint_inside_test + :avocado: tags=sanity,rhel,fedora,docker,docker_lint_inside_test,generic """ diff --git a/moduleframework/tests/generic/modulelint.py b/moduleframework/tests/generic/modulelint.py index 2402246..491620b 100644 --- a/moduleframework/tests/generic/modulelint.py +++ b/moduleframework/tests/generic/modulelint.py @@ -28,7 +28,7 @@ class ModuleLintSigning(module_framework.AvocadoTest): """ :avocado: disable - :avocado: tags=WIP,rhel,fedora,docker,module,package_signing_test + :avocado: tags=WIP,rhel,fedora,docker,module,package_signing_test,generic """ def setUp(self): diff --git a/moduleframework/tests/generic/rpmvalidation.py b/moduleframework/tests/generic/rpmvalidation.py index 4ec5ad1..4fe51af 100644 --- a/moduleframework/tests/generic/rpmvalidation.py +++ b/moduleframework/tests/generic/rpmvalidation.py @@ -35,7 +35,7 @@ class rpmvalidation(module_framework.AvocadoTest): http://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html :avocado: enable - :avocado: tags=sanity,rhel,fedora,docker,module,rpmvalidation_test + :avocado: tags=sanity,rhel,fedora,docker,module,rpmvalidation_test,generic """ fhs_base_paths_workaound = [ '/var/kerberos', diff --git a/moduleframework/tests/static/dockerfile_lint.py b/moduleframework/tests/static/dockerfile_lint.py index 2e14a4b..476206b 100644 --- a/moduleframework/tests/static/dockerfile_lint.py +++ b/moduleframework/tests/static/dockerfile_lint.py @@ -8,7 +8,7 @@ class DockerInstructionsTests(module_framework.AvocadoTest): """ :avocado: enable - :avocado: tags=sanity,rhel,fedora,docker,docker_instruction_test + :avocado: tags=sanity,rhel,fedora,docker,docker_instruction_test,static """ diff --git a/moduleframework/tests/static/helpmd_lint.py b/moduleframework/tests/static/helpmd_lint.py index 032ff04..1acbdf3 100644 --- a/moduleframework/tests/static/helpmd_lint.py +++ b/moduleframework/tests/static/helpmd_lint.py @@ -29,7 +29,7 @@ class HelpFileSanity(module_framework.AvocadoTest): """ :avocado: enable - :avocado: tags=optional,rhel,fedora,docker,helpmd_sanity_test + :avocado: tags=optional,rhel,fedora,docker,helpmd_sanity_test,static """