From 83e988a0a1c8f1f5dd86977df39b131a96f02df3 Mon Sep 17 00:00:00 2001 From: Federico Ressi Date: Mon, 10 Jan 2022 13:38:16 +0100 Subject: [PATCH] Fix EnsureQuotaLimitsTest test case Change-Id: I0291fe2ededb7386e33137ea9f63d2ffa30d1287 --- tobiko/tests/functional/openstack/test_heat.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tobiko/tests/functional/openstack/test_heat.py b/tobiko/tests/functional/openstack/test_heat.py index 61c8ff2e0..ca80bfdb3 100644 --- a/tobiko/tests/functional/openstack/test_heat.py +++ b/tobiko/tests/functional/openstack/test_heat.py @@ -97,10 +97,10 @@ class EnsureQuotaLimitsTest(testtools.TestCase): quota_set = neutron.get_neutron_quota_set(detail=True) for name, requirement in stack.requirements.items(): quota = quota_set[name] - self.assertGreaterEqual(quota['limit'], + self.assertGreaterEqual(int(quota['limit']), requirement + - max(0, quota['used']) - - max(0, quota['reserved'])) + max(0, int(quota['used'])) - + max(0, int(quota['reserved']))) def test_ensure_nova_quota_limits(self): stack = EnsureNovaQuotaLimitsFixture(stack_name=self.id()) @@ -108,10 +108,10 @@ class EnsureQuotaLimitsTest(testtools.TestCase): quota_set = nova.get_nova_quota_set(detail=True) for name, requirement in stack.requirements.items(): quota = getattr(quota_set, name) - if quota['limit'] > 0: - self.assertGreaterEqual(quota['limit'], - requirement + - max(0, quota['in_use']) - - max(0, quota['reserved'])) + if int(quota['limit']) > 0: + self.assertGreaterEqual(int(quota['limit']), + int(requirement) + + max(0, int(quota['in_use'])) - + max(0, int(quota['reserved']))) else: - self.assertEqual(quota['limit'], -1) + self.assertEqual(int(quota['limit']), -1)