diff options
Diffstat (limited to 'ceilometerclient/tests/v1/test_meters.py')
| -rw-r--r-- | ceilometerclient/tests/v1/test_meters.py | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/ceilometerclient/tests/v1/test_meters.py b/ceilometerclient/tests/v1/test_meters.py index f97c18b..1c883b7 100644 --- a/ceilometerclient/tests/v1/test_meters.py +++ b/ceilometerclient/tests/v1/test_meters.py @@ -12,7 +12,8 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - +from ceilometerclient.openstack.common.apiclient import client +from ceilometerclient.openstack.common.apiclient import fake_client from ceilometerclient.tests import utils import ceilometerclient.v1.meters @@ -109,15 +110,16 @@ class MeterManagerTest(utils.BaseTestCase): def setUp(self): super(MeterManagerTest, self).setUp() - self.api = utils.FakeAPI(fixtures) + self.http_client = fake_client.FakeHTTPClient(fixtures=fixtures) + self.api = client.BaseClient(self.http_client) self.mgr = ceilometerclient.v1.meters.MeterManager(self.api) def test_list_all(self): resources = list(self.mgr.list()) expect = [ - ('GET', '/v1/meters', {}, None), + 'GET', '/v1/meters' ] - self.assertEqual(self.api.calls, expect) + self.http_client.assert_called(*expect) self.assertEqual(len(resources), 2) self.assertEqual(resources[0].resource_id, 'a') self.assertEqual(resources[1].resource_id, 'b') @@ -125,9 +127,9 @@ class MeterManagerTest(utils.BaseTestCase): def test_list_by_source(self): resources = list(self.mgr.list(source='openstack')) expect = [ - ('GET', '/v1/sources/openstack/meters', {}, None), + 'GET', '/v1/sources/openstack/meters' ] - self.assertEqual(self.api.calls, expect) + self.http_client.assert_called(*expect) self.assertEqual(len(resources), 2) self.assertEqual(resources[0].resource_id, 'b') self.assertEqual(resources[1].resource_id, 'q') @@ -135,26 +137,26 @@ class MeterManagerTest(utils.BaseTestCase): def test_list_by_user(self): resources = list(self.mgr.list(user_id='joey')) expect = [ - ('GET', '/v1/users/joey/meters', {}, None), + 'GET', '/v1/users/joey/meters' ] - self.assertEqual(self.api.calls, expect) + self.http_client.assert_called(*expect) self.assertEqual(len(resources), 1) self.assertEqual(resources[0].resource_id, 'b') def test_list_by_project(self): resources = list(self.mgr.list(project_id='dig_the_ditch')) expect = [ - ('GET', '/v1/projects/dig_the_ditch/meters', {}, None), + 'GET', '/v1/projects/dig_the_ditch/meters' ] - self.assertEqual(self.api.calls, expect) + self.http_client.assert_called(*expect) self.assertEqual(len(resources), 1) self.assertEqual(resources[0].resource_id, 'b') def test_list_by_metaquery(self): resources = list(self.mgr.list(metaquery='metadata.zxc_id=foo')) expect = [ - ('GET', '/v1/meters?metadata.zxc_id=foo', {}, None), + 'GET', '/v1/meters?metadata.zxc_id=foo' ] - self.assertEqual(self.api.calls, expect) + self.http_client.assert_called(*expect) self.assertEqual(len(resources), 1) self.assertEqual(resources[0].resource_id, 'b') |