9f71b777ac
As bug #1477199 describes, the wrong comment below is all over the unit test code of OSC. # DisplayCommandBase.take_action() returns two tuples There is no such class named DisplayCommandBase in OSC. It is in cliff. All OSC command classes inherit from the base classes in cliff, class Command, class Lister and class ShowOne. It is like this: Object |--> Command |--> DisplayCommandBase |--> Lister |--> ShowOne take_action() is an abstract method of class Command, and generally is overwritten by subclasses. * Command.take_action() returns nothing. * Lister.take_action() returns a tuple which contains a tuple of columns and a generator used to generate the data. * ShowOne.take_action() returns an iterator which contains a tuple of columns and a tuple of data. So, this problem should be fixed in 3 steps: 1. Remove all DisplayCommandBase comments for tests of classes inheriting from class Command in cliff as it returns nothing. 2. Fix all DisplayCommandBase comments for tests of classes inheriting from class Lister in cliff. Lister.take_action() returns a tuple and a generator. 3. Fix all DisplayCommandBase comments for tests of classes inheriting from class ShowOne in cliff. ShowOne.take_action() returns two tuples. This patch finishes step 3 in all identity tests. Change-Id: I1f05e833cdacd30915954e4220b6e1f16ac1ed40 Closes-bug: #1477199
83 lines
2.6 KiB
Python
83 lines
2.6 KiB
Python
# Copyright 2014 eBay Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
|
|
import mock
|
|
|
|
from openstackclient.identity.v2_0 import token
|
|
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
|
|
|
|
|
|
class TestToken(identity_fakes.TestIdentityv2):
|
|
|
|
def setUp(self):
|
|
super(TestToken, self).setUp()
|
|
|
|
# Get a shortcut to the Service Catalog Mock
|
|
self.sc_mock = mock.Mock()
|
|
self.app.client_manager.auth_ref = mock.Mock()
|
|
self.app.client_manager.auth_ref.service_catalog = self.sc_mock
|
|
|
|
|
|
class TestTokenIssue(TestToken):
|
|
|
|
def setUp(self):
|
|
super(TestTokenIssue, self).setUp()
|
|
|
|
self.sc_mock.get_token.return_value = identity_fakes.TOKEN
|
|
self.cmd = token.IssueToken(self.app, None)
|
|
|
|
def test_token_issue(self):
|
|
arglist = []
|
|
verifylist = []
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class ShowOne in cliff, abstract method take_action()
|
|
# returns a two-part tuple with a tuple of column names and a tuple of
|
|
# data to be shown.
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
self.sc_mock.get_token.assert_called_with()
|
|
|
|
collist = ('expires', 'id', 'project_id', 'user_id')
|
|
self.assertEqual(collist, columns)
|
|
datalist = (
|
|
identity_fakes.token_expires,
|
|
identity_fakes.token_id,
|
|
identity_fakes.project_id,
|
|
identity_fakes.user_id,
|
|
)
|
|
self.assertEqual(datalist, data)
|
|
|
|
|
|
class TestTokenRevoke(TestToken):
|
|
|
|
TOKEN = 'fob'
|
|
|
|
def setUp(self):
|
|
super(TestTokenRevoke, self).setUp()
|
|
self.tokens_mock = self.app.client_manager.identity.tokens
|
|
self.tokens_mock.reset_mock()
|
|
self.tokens_mock.delete.return_value = True
|
|
self.cmd = token.RevokeToken(self.app, None)
|
|
|
|
def test_token_revoke(self):
|
|
arglist = [self.TOKEN]
|
|
verifylist = [('token', self.TOKEN)]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
self.cmd.take_action(parsed_args)
|
|
|
|
self.tokens_mock.delete.assert_called_with(self.TOKEN)
|