From 88beed19db0aeb1d77f2d138c74838be8f66985b Mon Sep 17 00:00:00 2001 From: Rajiv Kumar Date: Thu, 26 Mar 2015 04:18:08 +0000 Subject: [PATCH] Combine test cases for checking nova limits response nova rate-limit returns absolute limits too, but novaclient does not show absolute limit,a bug (https://bugs.launchpad.net/python-novaclient/+bug/1172254) has been filed for this one. There is no test which assert on both absolute and rate limit. This patch assert on both the rate and absolute limit returned Change-Id: Ia635f32eefc46e22e3f4e45a7885f492bb967a99 Closes-Bug: #1436653 --- novaclient/tests/unit/v2/test_limits.py | 33 +++++++++++-------------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/novaclient/tests/unit/v2/test_limits.py b/novaclient/tests/unit/v2/test_limits.py index 9dc9dec43..a72d6d602 100644 --- a/novaclient/tests/unit/v2/test_limits.py +++ b/novaclient/tests/unit/v2/test_limits.py @@ -32,23 +32,6 @@ class LimitsTest(utils.FixturedTestCase): self.assert_called('GET', '/limits?tenant_id=1234') self.assertIsInstance(obj, limits.Limits) - def test_absolute_limits(self): - obj = self.cs.limits.get() - - expected = ( - limits.AbsoluteLimit("maxTotalRAMSize", 51200), - limits.AbsoluteLimit("maxServerMeta", 5), - limits.AbsoluteLimit("maxImageMeta", 5), - limits.AbsoluteLimit("maxPersonality", 5), - limits.AbsoluteLimit("maxPersonalitySize", 10240), - ) - - abs_limits = list(obj.absolute) - self.assertEqual(len(abs_limits), len(expected)) - - for limit in abs_limits: - self.assertIn(limit, expected) - def test_absolute_limits_reserved(self): obj = self.cs.limits.get(reserved=True) @@ -67,7 +50,7 @@ class LimitsTest(utils.FixturedTestCase): for limit in abs_limits: self.assertIn(limit, expected) - def test_rate_limits(self): + def test_rate_absolute_limits(self): obj = self.cs.limits.get() expected = ( @@ -86,3 +69,17 @@ class LimitsTest(utils.FixturedTestCase): for limit in rate_limits: self.assertIn(limit, expected) + + expected = ( + limits.AbsoluteLimit("maxTotalRAMSize", 51200), + limits.AbsoluteLimit("maxServerMeta", 5), + limits.AbsoluteLimit("maxImageMeta", 5), + limits.AbsoluteLimit("maxPersonality", 5), + limits.AbsoluteLimit("maxPersonalitySize", 10240), + ) + + abs_limits = list(obj.absolute) + self.assertEqual(len(abs_limits), len(expected)) + + for limit in abs_limits: + self.assertIn(limit, expected)