diff --git a/nova/tests/functional/api_sample_tests/test_aggregates.py b/nova/tests/functional/api_sample_tests/test_aggregates.py index c8b1b8478..079183851 100644 --- a/nova/tests/functional/api_sample_tests/test_aggregates.py +++ b/nova/tests/functional/api_sample_tests/test_aggregates.py @@ -38,29 +38,25 @@ class AggregatesSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): "aggregate_id": '(?P\d+)' } response = self._do_post('os-aggregates', 'aggregate-post-req', subs) - subs.update(self._get_regexes()) return self._verify_response('aggregate-post-resp', subs, response, 200) def test_list_aggregates(self): self.test_aggregate_create() response = self._do_get('os-aggregates') - subs = self._get_regexes() - self._verify_response('aggregates-list-get-resp', subs, response, 200) + self._verify_response('aggregates-list-get-resp', {}, response, 200) def test_aggregate_get(self): agg_id = self.test_aggregate_create() response = self._do_get('os-aggregates/%s' % agg_id) - subs = self._get_regexes() - self._verify_response('aggregates-get-resp', subs, response, 200) + self._verify_response('aggregates-get-resp', {}, response, 200) def test_add_metadata(self): agg_id = self.test_aggregate_create() response = self._do_post('os-aggregates/%s/action' % agg_id, 'aggregate-metadata-post-req', {'action': 'set_metadata'}) - subs = self._get_regexes() - self._verify_response('aggregates-metadata-post-resp', subs, + self._verify_response('aggregates-metadata-post-resp', {}, response, 200) def test_add_host(self): @@ -70,7 +66,6 @@ class AggregatesSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): } response = self._do_post('os-aggregates/%s/action' % aggregate_id, 'aggregate-add-host-post-req', subs) - subs.update(self._get_regexes()) self._verify_response('aggregates-add-host-post-resp', subs, response, 200) @@ -81,7 +76,6 @@ class AggregatesSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): } response = self._do_post('os-aggregates/1/action', 'aggregate-remove-host-post-req', subs) - subs.update(self._get_regexes()) self._verify_response('aggregates-remove-host-post-resp', subs, response, 200) @@ -89,6 +83,5 @@ class AggregatesSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): aggregate_id = self.test_aggregate_create() response = self._do_put('os-aggregates/%s' % aggregate_id, 'aggregate-update-post-req', {}) - subs = self._get_regexes() self._verify_response('aggregate-update-post-resp', - subs, response, 200) + {}, response, 200)