diff --git a/utils/apparmor/profile_list.py b/utils/apparmor/profile_list.py index 167bc72d0..feed5afc9 100644 --- a/utils/apparmor/profile_list.py +++ b/utils/apparmor/profile_list.py @@ -189,6 +189,9 @@ class ProfileList: return deleted + def get_all_profiles(self): + return self.profiles + def get_profile_and_childs(self, profile_name): found = {} for prof in self.profiles: diff --git a/utils/test/test-profile-list.py b/utils/test/test-profile-list.py index 4c9791fb1..0f81763fc 100644 --- a/utils/test/test-profile-list.py +++ b/utils/test/test-profile-list.py @@ -508,9 +508,12 @@ class TestGet_profile_and_childs(AATest): self.pl.add_profile('/etc/apparmor.d/bin.foo', 'foo//xy', '/bin/foo//xy', self.dummy_profile) expected = ['foo', 'foo//bar', 'foo//xy'] - self.assertEqual(list(self.pl.get_profile_and_childs('foo')), expected) + # while on it, also test get_all_profiles() + all_profiles = ['bafoo', 'foo', 'foobar', 'foo//bar', 'foo//xy'] + self.assertEqual(list(self.pl.get_all_profiles()), all_profiles) + setup_aa(apparmor.aa) setup_all_loops(__name__)