<div dir="ltr">Hello,<br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, May 25, 2015 at 9:12 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>
this patch changes minitools_test.py to use the winbind instead of the<br>
ntpd profile for testing. The tests broke because the ntpd profile has<br>
the attach_disconnected flag set now, and therefore didn't match the<br>
expected flags anymore.<br>
<br></blockquote><div>Relevant: Look for a nitpick in response of Patch34 for the test profile change. <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
Also replace the usage of filecmp.cmp() in the cleanprof test with<br>
reading the file and using assertEqual - this has the advantage that we<br>
get a full diff instead of just "files differ".<br>
<br></blockquote><div>I don't know how I feel about this as we libraries should be preferred but sounds okay.<br> <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
Note: The aa-cleanprof test is still failing because of a bug in<br>
tools.py, but will be fixed by the next patch.<br>
See <a href="https://bugs.launchpad.net/apparmor/+bug/1416346" target="_blank">https://bugs.launchpad.net/apparmor/+bug/1416346</a> for details.<br>
<br>
<br>
[ 35-minitools_test-fix-all-tests.diff ]<br>
<br>
=== modified file utils/test/minitools_test.py<br>
--- utils/test/minitools_test.py 2015-05-25 15:58:04.255541915 +0200<br>
+++ utils/test/minitools_test.py 2015-05-25 16:31:17.092437563 +0200<br>
@@ -17,14 +17,14 @@<br>
import subprocess<br>
import sys<br>
import unittest<br>
-import filecmp<br>
<br>
import apparmor.aa as apparmor<br>
+from common_test import read_file<br>
<br>
# Path for the program<br>
-test_path = '/usr/sbin/ntpd'<br>
+test_path = '/usr/sbin/winbindd'<br>
# Path for the target file containing profile<br>
-local_profilename = './profiles/usr.sbin.ntpd'<br>
+local_profilename = './profiles/usr.sbin.winbindd'<br>
<br>
python_interpreter = 'python'<br>
if sys.version_info >= (3, 0):<br>
@@ -118,7 +118,10 @@<br>
#Strip off the first line (#modified line)<br>
subprocess.check_output('sed -i 1d ./profiles/%s'%(input_file), shell=True)<br>
<br>
- self.assertEqual(filecmp.cmp('./profiles/%s'%input_file, './%s'%output_file, False), True, 'Failed to cleanup profile properly')<br>
+ exp_content = read_file('./%s' % output_file)<br>
+ real_content = read_file('./profiles/%s' % input_file)<br>
+ self.maxDiff = None<br>
+ self.assertEqual(exp_content, real_content, 'Failed to cleanup profile properly')<br>
<br>
<br>
def clean_profile_dir():<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><div>Regards,<br><br></div>Kshitij Gupta <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>
<br>
Regards,<br>
<br>
Christian Boltz<br>
<span class=""><font color="#888888">--<br>
Der von Ihnen vielleicht erwartete Input wird zu dem eines verstimmten<br>
Mitarbeiters oder eines Crackers der Monate Zeit hat, oder einer Katze,<br>
die über die Tastatur läuft in keinerlei Zusammenhang stehen.<br>
[<a href="http://php.net/manual/de/security.general.php" target="_blank">http://php.net/manual/de/security.general.php</a>]<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>