From 505985ca86cb42695c67fc78ddbe0a94a82e0ff9 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Tue, 28 Jan 2014 17:38:57 +0100 Subject: [PATCH] samples: fix test case status code check If a driver returns NotImplemented, the status code won't be 404 but the test should not fail. Use the status argument in get_json for that check. Change-Id: I71f21589d3a9fa917746e5eecb20f0e883cab830 --- ceilometer/tests/api/__init__.py | 7 +++++-- ceilometer/tests/api/v2/test_list_meters_scenarios.py | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ceilometer/tests/api/__init__.py b/ceilometer/tests/api/__init__.py index c117db2e4..6326ba7e1 100644 --- a/ceilometer/tests/api/__init__.py +++ b/ceilometer/tests/api/__init__.py @@ -183,7 +183,8 @@ class FunctionalTest(db_test_base.TestBase): return response def get_json(self, path, expect_errors=False, headers=None, - extra_environ=None, q=[], groupby=[], **params): + extra_environ=None, q=[], groupby=[], status=None, + **params): """Sends simulated HTTP GET request to Pecan test app. :param path: url path of target service @@ -195,6 +196,7 @@ class FunctionalTest(db_test_base.TestBase): :param q: list of queries consisting of: field, value, op, and type keys :param groupby: list of fields to group by + :param status: Expected status code of response :param params: content for wsgi.input of request """ full_path = self.PATH_PREFIX + path @@ -217,7 +219,8 @@ class FunctionalTest(db_test_base.TestBase): params=all_params, headers=headers, extra_environ=extra_environ, - expect_errors=expect_errors) + expect_errors=expect_errors, + status=status) if not expect_errors: response = response.json print('GOT:%s' % response) diff --git a/ceilometer/tests/api/v2/test_list_meters_scenarios.py b/ceilometer/tests/api/v2/test_list_meters_scenarios.py index 7aeb51b87..19edbcb8a 100644 --- a/ceilometer/tests/api/v2/test_list_meters_scenarios.py +++ b/ceilometer/tests/api/v2/test_list_meters_scenarios.py @@ -188,8 +188,8 @@ class TestListMeters(FunctionalTest, u'volume': 3.0}) def test_get_not_existing_sample(self): - resp = self.get_json('/samples/not_exists', expect_errors=True) - self.assertEqual(resp.status_code, 404) + resp = self.get_json('/samples/not_exists', expect_errors=True, + status=404) self.assertEqual(jsonutils.loads(resp.body)['error_message'] ['faultstring'], "Sample not_exists Not Found")