<div dir="ltr">Hello,<br><div class="gmail_extra"><br><div class="gmail_quote">On Sun, May 31, 2015 at 11:28 PM, Christian Boltz <span dir="ltr"><<a href="mailto:apparmor@cboltz.de" target="_blank">apparmor@cboltz.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hello,<br>
<br>
After switching to winbindd as test profile, comments about the ntpd<br>
profile don't make sense anymore ;-)<br>
<br>
The patch also includes a whitespace fix.<br>
<br>
<br>
<br>
[ 43-update-comments-in-minitools_test.py.diff ]<br>
<br>
=== modified file utils/test/minitools_test.py<br>
--- utils/test/minitools_test.py 2015-05-29 12:59:09.219227339 +0200<br>
+++ utils/test/minitools_test.py 2015-05-31 19:45:33.730815706 +0200<br>
@@ -33,21 +33,21 @@<br>
class Test(unittest.TestCase):<br>
<br>
def test_audit(self):<br>
- #Set ntpd profile to audit mode and check if it was correctly set<br>
+ #Set test profile to audit mode and check if it was correctly set<br>
str(subprocess.check_output('%s ./../aa-audit --no-reload -d ./profiles %s'%(python_interpreter, test_path), shell=True))<br>
<br>
self.assertEqual(apparmor.get_profile_flags(local_profilename, test_path), 'audit', 'Audit flag could not be set in profile %s'%local_profilename)<br>
<br>
- #Remove audit mode from ntpd profile and check if it was correctly removed<br>
+ #Remove audit mode from test profile and check if it was correctly removed<br>
subprocess.check_output('%s ./../aa-audit --no-reload -d ./profiles -r %s'%(python_interpreter, test_path), shell=True)<br>
<br>
self.assertEqual(apparmor.get_profile_flags(local_profilename, test_path), None, 'Audit flag could not be removed in profile %s'%local_profilename)<br>
<br>
<br>
def test_complain(self):<br>
- #Set ntpd profile to complain mode and check if it was correctly set<br>
+ #Set test profile to complain mode and check if it was correctly set<br>
subprocess.check_output('%s ./../aa-complain --no-reload -d ./profiles %s'%(python_interpreter, test_path), shell=True)<br>
-<br>
+<br>
# "manually" create a force-complain symlink (will be deleted by aa-enforce later)<br>
if not os.path.isdir('./profiles/force-complain'):<br>
os.mkdir('./profiles/force-complain')<br>
@@ -56,7 +56,7 @@<br>
self.assertEqual(os.path.islink('./profiles/force-complain/%s'%os.path.basename(local_profilename)), True, 'Failed to create a symlink for %s in force-complain'%local_profilename)<br>
self.assertEqual(apparmor.get_profile_flags(local_profilename, test_path), 'complain', 'Complain flag could not be set in profile %s'%local_profilename)<br>
<br>
- #Set ntpd profile to enforce mode and check if it was correctly set<br>
+ #Set test profile to enforce mode and check if it was correctly set<br>
subprocess.check_output('%s ./../aa-enforce --no-reload -d ./profiles %s'%(python_interpreter, test_path), shell=True)<br>
<br>
self.assertEqual(os.path.islink('./profiles/force-complain/%s'%os.path.basename(local_profilename)), False, 'Failed to remove symlink for %s from force-complain'%local_profilename)<br>
@@ -83,9 +83,9 @@<br>
subprocess.check_output('%s ./../aa-audit --no-reload -d ./profiles -r %s'%(python_interpreter, test_path), shell=True)<br>
<br>
def test_enforce(self):<br>
- #Set ntpd profile to complain mode and check if it was correctly set<br>
+ #Set test profile to complain mode and check if it was correctly set<br>
<br>
- #Set ntpd profile to enforce mode and check if it was correctly set<br>
+ #Set test profile to enforce mode and check if it was correctly set<br>
subprocess.check_output('%s ./../aa-enforce --no-reload -d ./profiles %s'%(python_interpreter, test_path), shell=True)<br>
<br>
self.assertEqual(os.path.islink('./profiles/force-complain/%s'%os.path.basename(local_profilename)), False, 'Failed to remove symlink for %s from force-complain'%local_profilename)<br>
@@ -94,7 +94,7 @@<br>
<br>
<br>
def test_disable(self):<br>
- #Disable the ntpd profile and check if it was correctly disabled<br>
+ #Disable the test profile and check if it was correctly disabled<br>
subprocess.check_output('%s ./../aa-disable --no-reload -d ./profiles %s'%(python_interpreter, test_path), shell=True)<br>
<br>
self.assertEqual(os.path.islink('./profiles/disable/%s'%os.path.basename(local_profilename)), True, 'Failed to create a symlink for %s in disable'%local_profilename)<br>
<br>
<br></blockquote><div>Acked-by: Kshitij Gupta <<a href="mailto:kgupta8592@gmail.com" target="_blank">kgupta8592@gmail.com</a>>. <br><div><br></div><div>Thanks.<br><br></div>Regards, <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
Regards,<br>
<br>
Christian Boltz<br>
<span class=""><font color="#888888">--<br>
Es ist Fakt, dass ein Bug ziemlich oft zwischen Stuhllehne und<br>
Tastatur sitzt. [Thomas Hertweck in suse-linux]<br>
<br>
<br>
--<br>
AppArmor mailing list<br>
<a href="mailto:AppArmor@lists.ubuntu.com">AppArmor@lists.ubuntu.com</a><br>
Modify settings or unsubscribe at: <a href="https://lists.ubuntu.com/mailman/listinfo/apparmor" target="_blank">https://lists.ubuntu.com/mailman/listinfo/apparmor</a><br>
</font></span></blockquote></div><br></div></div>