[apparmor] [patch] utils: make all tests consistent in verbosity

[Steve Beattie]

[Clearing out a patch that had been languishing in my patch queue]

This patch adjusts the verbosity of several of the utils tests,
to make them all consistently verbose.

Signed-off-by: Steve Beattie <steve at nxnw.org>
---
 utils/test/aa_test.py               |    2 +-
 utils/test/test-aa-decode.py        |    2 +-
 utils/test/test-dbus_parse.py       |    2 +-
 utils/test/test-mount_parse.py      |    2 +-
 utils/test/test-pivot_root_parse.py |    2 +-
 utils/test/test-ptrace_parse.py     |    2 +-
 utils/test/test-signal_parse.py     |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

Index: b/utils/test/aa_test.py
===================================================================
--- a/utils/test/aa_test.py
+++ b/utils/test/aa_test.py
@@ -127,4 +127,4 @@ class Test(unittest.TestCase):
 
 if __name__ == "__main__":
     #import sys;sys.argv = ['', 'Test.testName']
-    unittest.main()
+    unittest.main(verbosity=2)
Index: b/utils/test/test-aa-decode.py
===================================================================
--- a/utils/test/test-aa-decode.py
+++ b/utils/test/test-aa-decode.py
@@ -200,4 +200,4 @@ type=AVC msg=audit(1348982148.195:2933):
 if __name__ == '__main__':
     if 'APPARMOR_DECODE' in os.environ:
         aadecode_bin = os.environ['APPARMOR_DECODE']
-    unittest.main()
+    unittest.main(verbosity=2)
Index: b/utils/test/test-dbus_parse.py
===================================================================
--- a/utils/test/test-dbus_parse.py
+++ b/utils/test/test-dbus_parse.py
@@ -27,4 +27,4 @@ class AAParseDBUSTest(unittest.TestCase)
                 'dbus object returned "%s", expected "%s"' % (dbus.serialize(), dstring))
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
Index: b/utils/test/test-mount_parse.py
===================================================================
--- a/utils/test/test-mount_parse.py
+++ b/utils/test/test-mount_parse.py
@@ -79,4 +79,4 @@ class AAParseUmountTest(unittest.TestCas
                 'mount object returned "%s", expected "%s"' % (mount.serialize(), rule))
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
Index: b/utils/test/test-pivot_root_parse.py
===================================================================
--- a/utils/test/test-pivot_root_parse.py
+++ b/utils/test/test-pivot_root_parse.py
@@ -32,4 +32,4 @@ class AAParsePivotRootTest(unittest.Test
         self._test_parse_pivot_root_rule('pivot_root /old /new -> /usr/bin/child,')
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
Index: b/utils/test/test-ptrace_parse.py
===================================================================
--- a/utils/test/test-ptrace_parse.py
+++ b/utils/test/test-ptrace_parse.py
@@ -50,4 +50,4 @@ class AAParsePtraceTest(unittest.TestCas
         self._test_parse_ptrace_rule('ptrace wr peer=/sbin/baz,')
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)
Index: b/utils/test/test-signal_parse.py
===================================================================
--- a/utils/test/test-signal_parse.py
+++ b/utils/test/test-signal_parse.py
@@ -59,4 +59,4 @@ class AAParseSignalTest(unittest.TestCas
         self._test_parse_signal_rule('signal wr set=(pipe, usr1) peer=/sbin/baz,')
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main(verbosity=2)


-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20140725/63a3d15a/attachment.pgp>