SEBA-282 xosgenx filtering by app or model;
provide a default argument class for XOSProcessor;
remove tabs;
rename unit tests missed by nose2
Change-Id: I07b782982b6733f8828b8a5a72807326f430b1a5
diff --git a/lib/xos-genx/xos-genx-tests/test_xos_security.py b/lib/xos-genx/xos-genx-tests/test_xos_security.py
index 2c704ac..766e102 100644
--- a/lib/xos-genx/xos-genx-tests/test_xos_security.py
+++ b/lib/xos-genx/xos-genx-tests/test_xos_security.py
@@ -15,10 +15,8 @@
import unittest
-from xosgenx.generator import XOSProcessor
-from helpers import FakeArgs, XProtoTestHelpers
-import pdb
-import mock
+from xosgenx.generator import XOSProcessor, XOSProcessorArgs
+from helpers import XProtoTestHelpers
"""The function below is for eliminating warnings arising due to the missing policy_output_enforcer,
which is generated and loaded dynamically.
@@ -44,7 +42,7 @@
"""
policy test_policy < ctx.user.is_admin | exists Privilege: Privilege.accessor_id = ctx.user.id & Privilege.object_type = "Deployment" & Privilege.permission = "role:admin" & Privilege.object_id = obj.id >
"""
- args = FakeArgs()
+ args = XOSProcessorArgs()
args.inputs = xproto
args.target = self.target
@@ -83,7 +81,7 @@
& Privilege.object_id = obj.owner.site.id
& Privilege.permission = "role:admin") >
"""
- args = FakeArgs()
+ args = XOSProcessorArgs()
args.inputs = xproto
args.target = self.target
@@ -131,7 +129,7 @@
)>
"""
- args = FakeArgs()
+ args = XOSProcessorArgs()
args.inputs = xproto
args.target = self.target
@@ -177,7 +175,7 @@
& Privilege.object_type = "Site"
& Privilege.object_id = ctx.user.site.id) >
"""
- args = FakeArgs()
+ args = XOSProcessorArgs()
args.inputs = xproto
args.target = self.target