Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix field type to audit_type

Browse Source 
There's a number of places where a field of an object is named "type",
which isn't good thing. Actually type is keyword in python, so wherever
I found type used in models/api/object/test, I have fixed it to
audit_type in the audit files

Change-Id: Iea6bd3acb0b2af2a833b3916701aad88f6064bba
Closes-Bug: #1533392
This commit is contained in:
digambar
2016-07-04 22:50:53 +05:30
parent 64903ce56c
commit 47ff9bb105
13 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
watcher/tests/db/test_action_plan.py
View File

@@ -252,7 +252,7 @@ class DbActionPlanTestCase(base.DbTestCase):
def test_get_action_plan_list_with_filters(self):
audit = self._create_test_audit(
id=1,
type='ONESHOT',
audit_type='ONESHOT',
uuid=w_utils.generate_uuid(),
deadline=None,
state='ONGOING')

12
watcher/tests/db/test_audit.py
View File

@@ -267,23 +267,23 @@ class DbAuditTestCase(base.DbTestCase):
def test_get_audit_list_with_filters(self):
audit1 = self._create_test_audit(
id=1,
type='ONESHOT',
audit_type='ONESHOT',
uuid=w_utils.generate_uuid(),
deadline=None,
state='ONGOING')
audit2 = self._create_test_audit(
id=2,
type='CONTINUOUS',
audit_type='CONTINUOUS',
uuid=w_utils.generate_uuid(),
deadline=None,
state='PENDING')
res = self.dbapi.get_audit_list(self.context,
filters={'type': 'ONESHOT'})
filters={'audit_type': 'ONESHOT'})
self.assertEqual([audit1['id']], [r.id for r in res])
res = self.dbapi.get_audit_list(self.context,
filters={'type': 'bad-type'})
filters={'audit_type': 'bad-type'})
self.assertEqual([], [r.id for r in res])
res = self.dbapi.get_audit_list(
@@ -331,7 +331,7 @@ class DbAuditTestCase(base.DbTestCase):
)
audit = self._create_test_audit(
type='ONESHOT',
audit_type='ONESHOT',
uuid=w_utils.generate_uuid(),
deadline=None,
state='ONGOING',
@@ -357,7 +357,7 @@ class DbAuditTestCase(base.DbTestCase):
)
audit = self._create_test_audit(
type='ONESHOT',
audit_type='ONESHOT',
uuid=w_utils.generate_uuid(),
deadline=None,
state='ONGOING',

2
watcher/tests/db/utils.py
View File

@@ -54,7 +54,7 @@ def get_test_audit(**kwargs):
return {
'id': kwargs.get('id', 1),
'uuid': kwargs.get('uuid', '10a47dd1-4874-4298-91cf-eff046dbdb8d'),
'type': kwargs.get('type', 'ONESHOT'),
'audit_type': kwargs.get('audit_type', 'ONESHOT'),
'state': kwargs.get('state'),
'deadline': kwargs.get('deadline'),
'audit_template_id': kwargs.get('audit_template_id', 1),