openstack/watcher-tempest-plugin
Code Issues Proposed changes

Fix functional tests taking into account HA changes

Browse Source 
This patch set also removes zone_migration tempest test.
We plan to place it along with other tests in openstack/watcher
repo.

Change-Id: I923355f1a2c5404db3455c5c86f8a12fdf7a9d28
This commit is contained in:
Alexander Chadin 2018-07-27 09:48:34 +03:00
parent 121d26f6c2
commit e5f1b09c6e
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.zuul.yaml
View File

@ -11,14 +11,8 @@
voting: false voting: false
- watcher-tempest-workload_balancing: - watcher-tempest-workload_balancing:
voting: false voting: false
- watcher-tempest-zone_migration
gate: gate:
jobs: jobs:
- watcher-tempest-zone_migration - watcher-tempest-functional
- job:
name: watcher-tempest-zone_migration
parent: watcher-tempest-multinode
vars:
tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_zone_migration'

10
watcher_tempest_plugin/tests/api/admin/test_audit.py
View File

@ -210,7 +210,7 @@ class TestShowListAudit(base.BaseInfraOptimTest):
def assert_expected(self, expected, actual, def assert_expected(self, expected, actual,
keys=('created_at', 'updated_at', keys=('created_at', 'updated_at',
'deleted_at', 'state')): 'deleted_at', 'state', 'hostname')):
super(TestShowListAudit, self).assert_expected( super(TestShowListAudit, self).assert_expected(
expected, actual, keys) expected, actual, keys)
@ -221,16 +221,14 @@ class TestShowListAudit(base.BaseInfraOptimTest):
initial_audit = self.audit.copy() initial_audit = self.audit.copy()
del initial_audit['state'] del initial_audit['state']
if initial_audit.get('hostname'): del initial_audit['hostname']
del initial_audit['hostname']
audit_state = audit['state'] audit_state = audit['state']
actual_audit = audit.copy() actual_audit = audit.copy()
del actual_audit['state'] del actual_audit['state']
self.assertIn(audit_state, self.audit_states) self.assertIn(audit_state, self.audit_states)
if actual_audit.get('hostname'): self.assertIsNotNone(actual_audit['hostname'])
self.assertIsNotNone(actual_audit['hostname']) del actual_audit['hostname']
del actual_audit['hostname']
self.assert_expected(initial_audit, actual_audit) self.assert_expected(initial_audit, actual_audit)
@decorators.attr(type='smoke') @decorators.attr(type='smoke')