diff --git a/utils/test/test-abi.py b/utils/test/test-abi.py index f0a64dd28..538f374f9 100644 --- a/utils/test/test-abi.py +++ b/utils/test/test-abi.py @@ -280,7 +280,7 @@ class AbiLogprofHeaderTest(AATest): # ] def _run_test(self, params, expected): - obj = AbiRule._parse(params) + obj = AbiRule.parse(params) self.assertEqual(obj.logprof_header(), expected) ## --- tests for AbiRuleset --- # diff --git a/utils/test/test-alias.py b/utils/test/test-alias.py index eff621c8d..2be36e1e6 100644 --- a/utils/test/test-alias.py +++ b/utils/test/test-alias.py @@ -233,7 +233,7 @@ class AliasLogprofHeaderTest(AATest): ] def _run_test(self, params, expected): - obj = AliasRule._parse(params) + obj = AliasRule.parse(params) self.assertEqual(obj.logprof_header(), expected) # --- tests for AliasRuleset --- # diff --git a/utils/test/test-boolean.py b/utils/test/test-boolean.py index 743d4e847..767500658 100644 --- a/utils/test/test-boolean.py +++ b/utils/test/test-boolean.py @@ -241,7 +241,7 @@ class BooleanLogprofHeaderTest(AATest): ] def _run_test(self, params, expected): - obj = BooleanRule._parse(params) + obj = BooleanRule.parse(params) self.assertEqual(obj.logprof_header(), expected) # --- tests for BooleanRuleset --- # diff --git a/utils/test/test-capability.py b/utils/test/test-capability.py index ab25223c4..e4a604896 100644 --- a/utils/test/test-capability.py +++ b/utils/test/test-capability.py @@ -451,7 +451,7 @@ class CapabilityLogprofHeaderTest(AATest): ] def _run_test(self, params, expected): - obj = CapabilityRule._parse(params) + obj = CapabilityRule.parse(params) self.assertEqual(obj.logprof_header(), expected) # --- tests for CapabilityRuleset --- # diff --git a/utils/test/test-change_profile.py b/utils/test/test-change_profile.py index 3fe3c4891..fb597b7d5 100644 --- a/utils/test/test-change_profile.py +++ b/utils/test/test-change_profile.py @@ -394,7 +394,7 @@ class ChangeProfileLogprofHeaderTest(AATest): ] def _run_test(self, params, expected): - obj = ChangeProfileRule._parse(params) + obj = ChangeProfileRule.parse(params) self.assertEqual(obj.logprof_header(), expected) # --- tests for ChangeProfileRuleset --- # diff --git a/utils/test/test-dbus.py b/utils/test/test-dbus.py index 069445089..1fd87ce61 100644 --- a/utils/test/test-dbus.py +++ b/utils/test/test-dbus.py @@ -779,7 +779,7 @@ class DbusLogprofHeaderTest(AATest): ] def _run_test(self, params, expected): - obj = DbusRule._parse(params) + obj = DbusRule.parse(params) self.assertEqual(obj.logprof_header(), expected) ## --- tests for DbusRuleset --- # diff --git a/utils/test/test-file.py b/utils/test/test-file.py index 8db7f7a42..cf3e8e4bd 100644 --- a/utils/test/test-file.py +++ b/utils/test/test-file.py @@ -824,13 +824,13 @@ class FileLogprofHeaderTest(AATest): ] def _run_test(self, params, expected): - obj = FileRule._parse(params[0]) + obj = FileRule.parse(params[0]) if params[1] or params[2]: obj.original_perms = {'allow': { 'all': params[1], 'owner': params[2]}} self.assertEqual(obj.logprof_header(), expected) def test_empty_original_perms(self): - obj = FileRule._parse('/foo rw,') + obj = FileRule.parse('/foo rw,') obj.original_perms = {'allow': { 'all': set(), 'owner': set()}} self.assertEqual(obj.logprof_header(), [_('Path'), '/foo', _('New Mode'), _('rw')]) diff --git a/utils/test/test-include.py b/utils/test/test-include.py index a64a39105..7c85921ac 100644 --- a/utils/test/test-include.py +++ b/utils/test/test-include.py @@ -336,7 +336,7 @@ class IncludeLogprofHeaderTest(AATest): # ] def _run_test(self, params, expected): - obj = IncludeRule._parse(params) + obj = IncludeRule.parse(params) self.assertEqual(obj.logprof_header(), expected) class IncludeFullPathsTest(AATest): @@ -375,7 +375,7 @@ class IncludeFullPathsTest(AATest): for path in expected: exp2.append(path.replace('@@', self.profile_dir)) - obj = IncludeRule._parse(params) + obj = IncludeRule.parse(params) self.assertEqual(obj.get_full_paths(self.profile_dir), exp2) ## --- tests for IncludeRuleset --- # diff --git a/utils/test/test-network.py b/utils/test/test-network.py index afff4de91..0470cf715 100644 --- a/utils/test/test-network.py +++ b/utils/test/test-network.py @@ -374,7 +374,7 @@ class NetworkLogprofHeaderTest(AATest): ] def _run_test(self, params, expected): - obj = NetworkRule._parse(params) + obj = NetworkRule.parse(params) self.assertEqual(obj.logprof_header(), expected) class NetworkRuleReprTest(AATest): diff --git a/utils/test/test-ptrace.py b/utils/test/test-ptrace.py index e8b637fbe..64817f8ef 100644 --- a/utils/test/test-ptrace.py +++ b/utils/test/test-ptrace.py @@ -473,7 +473,7 @@ class PtraceLogprofHeaderTest(AATest): ] def _run_test(self, params, expected): - obj = PtraceRule._parse(params) + obj = PtraceRule.parse(params) self.assertEqual(obj.logprof_header(), expected) ## --- tests for PtraceRuleset --- # diff --git a/utils/test/test-rlimit.py b/utils/test/test-rlimit.py index a1e041340..ef981e399 100644 --- a/utils/test/test-rlimit.py +++ b/utils/test/test-rlimit.py @@ -359,7 +359,7 @@ class RlimitLogprofHeaderTest(AATest): ] def _run_test(self, params, expected): - obj = RlimitRule._parse(params) + obj = RlimitRule.parse(params) self.assertEqual(obj.logprof_header(), expected) # --- tests for RlimitRuleset --- # diff --git a/utils/test/test-signal.py b/utils/test/test-signal.py index f95a17885..e294db815 100644 --- a/utils/test/test-signal.py +++ b/utils/test/test-signal.py @@ -530,7 +530,7 @@ class SignalLogprofHeaderTest(AATest): ] def _run_test(self, params, expected): - obj = SignalRule._parse(params) + obj = SignalRule.parse(params) self.assertEqual(obj.logprof_header(), expected) ## --- tests for SignalRuleset --- # diff --git a/utils/test/test-variable.py b/utils/test/test-variable.py index 95800acbc..9e6c1e5c5 100644 --- a/utils/test/test-variable.py +++ b/utils/test/test-variable.py @@ -311,7 +311,7 @@ class VariableLogprofHeaderTest(AATest): ] def _run_test(self, params, expected): - obj = VariableRule._parse(params) + obj = VariableRule.parse(params) self.assertEqual(obj.logprof_header(), expected) # --- tests for VariableRuleset --- #