[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apparmor-dev
Subject:    [apparmor] [patch 6/8] utils tests: restructure pivotroot parse tests
From:       Steve Beattie <steve () nxnw ! org>
Date:       2014-08-29 0:04:10
Message-ID: 20140829000405.359273273 () nxnw ! org
[Download RAW message or body]

Convert the pivotroot parse tests to use common AAParseTest super class in
common_test.py.

Signed-off-by: Steve Beattie <steve@nxnw.org>
---
 utils/test/test-pivot_root_parse.py |   30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

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
@@ -11,25 +11,19 @@
 
 import apparmor.aa as aa
 import unittest
+from common_test import AAParseTest, setup_regex_tests
 
-class AAParsePivotRootTest(unittest.TestCase):
-
-    def _test_parse_pivot_root_rule(self, rule):
-        pivot_root = aa.parse_pivot_root_rule(rule)
-        self.assertEqual(rule, pivot_root.serialize(),
-                'pivot_root object returned "%s", expected "%s"' % (pivot_root.serialize(), rule))
-
-    def test_parse_plain_pivot_root_rule(self):
-        self._test_parse_pivot_root_rule('pivot_root,')
-
-    def test_parse_old_pivot_root_rule(self):
-        self._test_parse_pivot_root_rule('pivot_root /old,')
-
-    def test_parse_new_pivot_root_rule(self):
-        self._test_parse_pivot_root_rule('pivot_root /old /new,')
-
-    def test_parse_child_pivot_root_rule(self):
-        self._test_parse_pivot_root_rule('pivot_root /old /new -> /usr/bin/child,')
+class AAParsePivotRootTest(AAParseTest):
+    def setUp(self):
+        self.parse_function = aa.parse_pivot_root_rule
+
+    tests = [
+        ('pivot_root,', 'pivot_root base keyword'),
+        ('pivot_root /old,', 'pivot_root oldroot rule'),
+        ('pivot_root /old /new,', 'pivot_root old and new root rule'),
+        ('pivot_root /old /new -> /usr/bin/child,', 'pivot_root child rule'),
+    ]
 
 if __name__ == '__main__':
+    setup_regex_tests(AAParsePivotRootTest)
     unittest.main(verbosity=2)


-- 
AppArmor mailing list
AppArmor@lists.ubuntu.com
Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
[prev in list] [next in list] [prev in thread] [next in thread]