openstack
/
manila
Code Issues Proposed changes

Fix pool_list filter tests to match pools exactly 

The Tempest tests for the scheduler's pool-list filters can match pools
other than the ones they should, because the regex strings are not
wrapped with ^ and $. We hit this in the NetApp CI system.

Closes-Bug: #1496375
Change-Id: I423ea164ff62df87e31e5b0ed5cf19870e897cde
This commit is contained in:
Clinton Knight 2015-09-16 08:25:03 -04:00
parent 4ae6f43093
commit e61b76c5bf
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manila_tempest_tests/tests/api/admin/test_scheduler_stats.py
View File

@ -50,9 +50,9 @@ class SchedulerStatsAdminTest(base.BaseSharesAdminTest):
# Build search opts from data and get pools again with filter
search_opts = {
'host': pool.get('host'),
'backend': pool.get('backend'),
'pool': pool.get('pool'),
'host': self._wrap_regex_for_exact_match(pool.get('host')),
'backend': self._wrap_regex_for_exact_match(pool.get('backend')),
'pool': self._wrap_regex_for_exact_match(pool.get('pool')),
}
pool_response = self.shares_client.list_pools(
search_opts=search_opts)
@ -63,7 +63,7 @@ class SchedulerStatsAdminTest(base.BaseSharesAdminTest):
# Match the key values, not the timestamp.
for k, v in search_opts.items():
self.assertEqual(v, filtered_pool_list[0][k])
self.assertEqual(v[1:-1], filtered_pool_list[0][k])
@test.attr(type=["gate", "smoke", ])
def test_pool_list_with_filters_negative(self):
@ -108,9 +108,9 @@ class SchedulerStatsAdminTest(base.BaseSharesAdminTest):
# Build search opts from data and get pools again with filter
search_opts = {
'host': pool.get('host'),
'backend': pool.get('backend'),
'pool': pool.get('pool'),
'host': self._wrap_regex_for_exact_match(pool.get('host')),
'backend': self._wrap_regex_for_exact_match(pool.get('backend')),
'pool': self._wrap_regex_for_exact_match(pool.get('pool')),
}
pool_response = self.shares_client.list_pools(
detail=True, search_opts=search_opts)
@ -121,7 +121,7 @@ class SchedulerStatsAdminTest(base.BaseSharesAdminTest):
# Match the key values, not the timestamp.
for k, v in search_opts.items():
self.assertEqual(v, filtered_pool_list[0][k])
self.assertEqual(v[1:-1], filtered_pool_list[0][k])
@test.attr(type=["gate", "smoke", ])
def test_pool_list_detail_with_filters_negative(self):
@ -138,3 +138,6 @@ class SchedulerStatsAdminTest(base.BaseSharesAdminTest):
# Ensure we got no pools
self.assertEmpty(pool_list)
def _wrap_regex_for_exact_match(self, regex):
return '^%s$' % regex