openstack/python-openstackclient
Code Issues Proposed changes

Merge "Revert unit tests for quota commands"

Browse Source
This commit is contained in:
Jenkins 2017-02-23 18:30:21 +00:00 committed by Gerrit Code Review
commit 9ccf8fd067
1 changed files with 29 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openstackclient/tests/unit/common/test_quota.py
View File

@ -13,8 +13,6 @@
import copy import copy
import mock import mock
from openstack.network.v2 import quota as _quota
from openstackclient.common import quota from openstackclient.common import quota
from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
from openstackclient.tests.unit import fakes from openstackclient.tests.unit import fakes
@ -284,11 +282,6 @@ class TestQuotaSet(TestQuota):
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# TODO(huanxuan): Remove this if condition once the fixed
# SDK Quota class is the minimum required version.
# This is expected to be SDK release 0.9.13
if not hasattr(_quota.Quota, 'allow_get'):
# Just run this when sdk <= 0.9.10
result = self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)
kwargs = { kwargs = {
'subnet': network_fakes.QUOTA['subnet'], 'subnet': network_fakes.QUOTA['subnet'],
@ -483,11 +476,6 @@ class TestQuotaShow(TestQuota):
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
# TODO(huanxuan): Remove this if condition once the fixed
# SDK QuotaDefault class is the minimum required version.
# This is expected to be SDK release 0.9.13
if not hasattr(_quota.QuotaDefault, 'project'):
# Just run this when sdk <= 0.9.10
self.cmd.take_action(parsed_args) self.cmd.take_action(parsed_args)
self.quotas_mock.defaults.assert_called_once_with( self.quotas_mock.defaults.assert_called_once_with(