diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-08 15:20:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-08 15:20:45 +0000 |
| commit | 7c6cc05ff0e9e95313384303deee69ef11929bc1 (patch) | |
| tree | 71aa7ef8818b1af245467a969c538aea2025d341 /ceilometerclient/tests/unit/v2/test_statistics.py | |
| parent | b064a07fa0b4da9859f99d0e0cb04f2c64b4343c (diff) | |
| parent | 481cd7d33bf5f91c39888fa695238c562eda7945 (diff) | |
| download | python-ceilometerclient-2.6.0.tar.gz | |
Merge "Correct the parameters's position of assertEqual"2.6.0
Diffstat (limited to 'ceilometerclient/tests/unit/v2/test_statistics.py')
| -rw-r--r-- | ceilometerclient/tests/unit/v2/test_statistics.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ceilometerclient/tests/unit/v2/test_statistics.py b/ceilometerclient/tests/unit/v2/test_statistics.py index d2f7aee..e41b38c 100644 --- a/ceilometerclient/tests/unit/v2/test_statistics.py +++ b/ceilometerclient/tests/unit/v2/test_statistics.py @@ -125,8 +125,8 @@ class StatisticsManagerTest(utils.BaseTestCase): 'GET', '/v2/meters/instance/statistics' ] self.http_client.assert_called(*expect) - self.assertEqual(len(stats), 1) - self.assertEqual(stats[0].count, 135) + self.assertEqual(1, len(stats)) + self.assertEqual(135, stats[0].count) def test_list_by_meter_name_extended(self): stats = list(self.mgr.list(meter_name='instance', @@ -140,8 +140,8 @@ class StatisticsManagerTest(utils.BaseTestCase): 'GET', '%s?%s' % (base_url, qry) ] self.http_client.assert_called(*expect) - self.assertEqual(len(stats), 1) - self.assertEqual(stats[0].count, 135) + self.assertEqual(1, len(stats)) + self.assertEqual(135, stats[0].count) def test_list_by_meter_name_with_period(self): stats = list(self.mgr.list(meter_name='instance', @@ -156,8 +156,8 @@ class StatisticsManagerTest(utils.BaseTestCase): 'GET', '%s?%s%s' % (base_url, qry, period) ] self.http_client.assert_called(*expect) - self.assertEqual(len(stats), 1) - self.assertEqual(stats[0].count, 135) + self.assertEqual(1, len(stats)) + self.assertEqual(135, stats[0].count) def test_list_by_meter_name_with_groupby(self): stats = list(self.mgr.list(meter_name='instance', @@ -173,11 +173,11 @@ class StatisticsManagerTest(utils.BaseTestCase): '%s?%s%s' % (base_url, qry, groupby) ] self.http_client.assert_called(*expect) - self.assertEqual(len(stats), 2) - self.assertEqual(stats[0].count, 135) - self.assertEqual(stats[1].count, 12) - self.assertEqual(stats[0].groupby.get('resource_id'), 'foo') - self.assertEqual(stats[1].groupby.get('resource_id'), 'bar') + self.assertEqual(2, len(stats)) + self.assertEqual(135, stats[0].count) + self.assertEqual(12, stats[1].count) + self.assertEqual('foo', stats[0].groupby.get('resource_id')) + self.assertEqual('bar', stats[1].groupby.get('resource_id')) def test_list_by_meter_name_with_groupby_as_str(self): stats = list(self.mgr.list(meter_name='instance', |