From 583ea724b25fe59392cf45a8e5fe86d8d9539a8b Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Mon, 1 Jun 2020 15:54:34 +0200 Subject: [PATCH] fix setting apparmor.aa.profile_dir in some tests cherry picked from commit 6fe4b5e59afe85e3bbfe98eab7e291c9f532db25 - but only the test-aa.py changes because test-profile-list.py didn't have the affected tests in 2.13 yet --- utils/test/test-aa.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/test/test-aa.py b/utils/test/test-aa.py index b52217371..890cfac74 100644 --- a/utils/test/test-aa.py +++ b/utils/test/test-aa.py @@ -130,7 +130,7 @@ class AaTest_create_new_profile(AATest): shutil.copytree('../../profiles/apparmor.d/', self.profile_dir, symlinks=True) # load the abstractions we need in the test - apparmor.aa.profiledir = self.profile_dir + apparmor.aa.profile_dir = self.profile_dir apparmor.aa.load_include('abstractions/base') apparmor.aa.load_include('abstractions/bash') @@ -818,7 +818,7 @@ class AaTest_get_file_perms_2(AATest): shutil.copytree('../../profiles/apparmor.d/', self.profile_dir, symlinks=True) # load the abstractions we need in the test - apparmor.aa.profiledir = self.profile_dir + apparmor.aa.profile_dir = self.profile_dir apparmor.aa.load_include('abstractions/base') apparmor.aa.load_include('abstractions/bash') apparmor.aa.load_include('abstractions/enchant') @@ -856,7 +856,7 @@ class AaTest_propose_file_rules(AATest): shutil.copytree('../../profiles/apparmor.d/', self.profile_dir, symlinks=True) # load the abstractions we need in the test - apparmor.aa.profiledir = self.profile_dir + apparmor.aa.profile_dir = self.profile_dir apparmor.aa.load_include('abstractions/base') apparmor.aa.load_include('abstractions/bash') apparmor.aa.load_include('abstractions/enchant') @@ -898,7 +898,7 @@ class AaTest_propose_file_rules_with_absolute_includes(AATest): shutil.copytree('../../profiles/apparmor.d/', self.profile_dir, symlinks=True) # load the abstractions we need in the test - apparmor.aa.profiledir = self.profile_dir + apparmor.aa.profile_dir = self.profile_dir apparmor.aa.load_include('abstractions/base') abs_include1 = write_file(self.tmpdir, 'test-abs1', "/some/random/include rw,")