From 930218193bc54d73fb66140cd6847b2b8b51d62b Mon Sep 17 00:00:00 2001 From: Ryan Lee Date: Thu, 27 Feb 2025 16:14:02 -0800 Subject: [PATCH] utils: remove the skip_*_profiles testing bypass The utils should be able to skip profiles that it can't parse now, so this test suite bypass mechanism should no longer be necessary. Signed-off-by: Ryan Lee --- utils/test/common_test.py | 7 ------- utils/test/test-logprof.py | 4 ++-- utils/test/test-minitools.py | 4 ++-- utils/test/test-profile-list.py | 4 ++-- utils/test/test-profiles.py | 6 +++--- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/utils/test/common_test.py b/utils/test/common_test.py index 3931c0d89..75e6ceea0 100755 --- a/utils/test/common_test.py +++ b/utils/test/common_test.py @@ -24,13 +24,6 @@ import unittest # print("Please press the Y button on the keyboard.") # self.assertEqual(apparmor.common.readkey().lower(), 'y', 'Error reading key from shell!') -# If a profile can't be parsed by the tools, add it to skip_active_profiles or skip_extra_profiles. -# Add only the filename (without path), for example 'usr.bin.foo'. -# These skip lists are meant as a temporary solution, and should be empty on release. -skip_active_profiles = [] - -skip_extra_profiles = [] - class AATest(unittest.TestCase): def setUp(self): diff --git a/utils/test/test-logprof.py b/utils/test/test-logprof.py index ae9742a00..e16299ba8 100644 --- a/utils/test/test-logprof.py +++ b/utils/test/test-logprof.py @@ -16,7 +16,7 @@ import sys import unittest # import apparmor.aa as aa # see the setup_aa() call for details -from common_test import AATest, read_file, setup_all_loops, skip_active_profiles # , setup_aa +from common_test import AATest, read_file, setup_all_loops # , setup_aa class TestLogprof(AATest): @@ -36,7 +36,7 @@ class TestLogprof(AATest): # copy the local profiles to the test directory self.profile_dir = self.tmpdir + '/profiles' shutil.copytree('../../profiles/apparmor.d/', self.profile_dir, - symlinks=True, ignore=shutil.ignore_patterns(*skip_active_profiles)) + symlinks=True) def AATeardown(self): self._terminate() diff --git a/utils/test/test-minitools.py b/utils/test/test-minitools.py index 1b645274b..aa57057ae 100755 --- a/utils/test/test-minitools.py +++ b/utils/test/test-minitools.py @@ -18,7 +18,7 @@ import sys import unittest import apparmor.aa as apparmor -from common_test import AATest, read_file, write_file, setup_aa, setup_all_loops, skip_active_profiles +from common_test import AATest, read_file, write_file, setup_aa, setup_all_loops # Use the same python as the one this script is being run with python_interpreter = sys.executable @@ -35,7 +35,7 @@ class MinitoolsTest(AATest): # Should be the set of cleanprofile self.profile_dir = self.tmpdir + '/profiles' shutil.copytree('../../profiles/apparmor.d/', self.profile_dir, - symlinks=True, ignore=shutil.ignore_patterns(*skip_active_profiles)) + symlinks=True) apparmor.profile_dir = self.profile_dir diff --git a/utils/test/test-profile-list.py b/utils/test/test-profile-list.py index 1da177972..d3b33fdcc 100644 --- a/utils/test/test-profile-list.py +++ b/utils/test/test-profile-list.py @@ -24,7 +24,7 @@ from apparmor.rule.alias import AliasRule from apparmor.rule.boolean import BooleanRule from apparmor.rule.include import IncludeRule from apparmor.rule.variable import VariableRule -from common_test import AATest, setup_aa, setup_all_loops, write_file, skip_active_profiles +from common_test import AATest, setup_aa, setup_all_loops, write_file class TestAdd_profile(AATest): @@ -430,7 +430,7 @@ class AaTest_get_all_merged_variables(AATest): apparmor.aa.loadincludes() # Keep this synced with the list in test-logprof.py and # test-minitools.py - apparmor.aa.read_profiles(skip_profiles=skip_active_profiles) + apparmor.aa.read_profiles() def test_unchanged(self): self._load_profiles() diff --git a/utils/test/test-profiles.py b/utils/test/test-profiles.py index c0b3e080c..6bc438595 100644 --- a/utils/test/test-profiles.py +++ b/utils/test/test-profiles.py @@ -12,7 +12,7 @@ import unittest import apparmor.aa as aa -from common_test import AATest, setup_aa, setup_all_loops, skip_active_profiles, skip_extra_profiles +from common_test import AATest, setup_aa, setup_all_loops class TestFoo(AATest): @@ -23,12 +23,12 @@ class TestFoo(AATest): # (to make sure an empty or non-existing directory won't make this test useless). def test_active_profiles(self): - aa.read_profiles(skip_profiles=skip_active_profiles) + aa.read_profiles() self.assertGreaterEqual(len(aa.active_profiles.profile_names), 42) def test_extra_profiles(self): - aa.read_inactive_profiles(skip_profiles=skip_extra_profiles) + aa.read_inactive_profiles() self.assertGreaterEqual(len(aa.extra_profiles.profile_names), 100)