diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-01 22:26:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-01 22:26:41 +0000 |
| commit | 3681c186f784b0b64f871050a0dfdb3b1bed37b8 (patch) | |
| tree | 63fd60b27ce5b4540072a2b68f5a7444a0cdc363 | |
| parent | 493a33a0249c78630fc95b3753bf5c612d956874 (diff) | |
| parent | 88beed19db0aeb1d77f2d138c74838be8f66985b (diff) | |
| download | python-novaclient-3681c186f784b0b64f871050a0dfdb3b1bed37b8.tar.gz | |
Merge "Combine test cases for checking nova limits response"
| -rw-r--r-- | novaclient/tests/unit/v2/test_limits.py | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/novaclient/tests/unit/v2/test_limits.py b/novaclient/tests/unit/v2/test_limits.py index 9dc9dec4..a72d6d60 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) |