Skip to content

Commit f781349

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "Compute: Fix DisplayCommandBase comments for cliff Lister subclass tests"
2 parents 124f21d + 3c67e8d commit f781349

4 files changed

Lines changed: 27 additions & 9 deletions

File tree

openstackclient/tests/compute/v2/test_flavor.py

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,9 @@ def test_flavor_list_no_options(self):
126126

127127
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
128128

129-
# DisplayCommandBase.take_action() returns two tuples
129+
# In base command class Lister in cliff, abstractmethod take_action()
130+
# returns a tuple containing the column names and an iterable
131+
# containing the data to be listed.
130132
columns, data = self.cmd.take_action(parsed_args)
131133

132134
# Set expected values
@@ -153,7 +155,9 @@ def test_flavor_list_all_flavors(self):
153155

154156
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
155157

156-
# DisplayCommandBase.take_action() returns two tuples
158+
# In base command class Lister in cliff, abstractmethod take_action()
159+
# returns a tuple containing the column names and an iterable
160+
# containing the data to be listed.
157161
columns, data = self.cmd.take_action(parsed_args)
158162

159163
# Set expected values
@@ -180,7 +184,9 @@ def test_flavor_list_private_flavors(self):
180184

181185
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
182186

183-
# DisplayCommandBase.take_action() returns two tuples
187+
# In base command class Lister in cliff, abstractmethod take_action()
188+
# returns a tuple containing the column names and an iterable
189+
# containing the data to be listed.
184190
columns, data = self.cmd.take_action(parsed_args)
185191

186192
# Set expected values
@@ -207,7 +213,9 @@ def test_flavor_list_public_flavors(self):
207213

208214
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
209215

210-
# DisplayCommandBase.take_action() returns two tuples
216+
# In base command class Lister in cliff, abstractmethod take_action()
217+
# returns a tuple containing the column names and an iterable
218+
# containing the data to be listed.
211219
columns, data = self.cmd.take_action(parsed_args)
212220

213221
# Set expected values
@@ -234,7 +242,9 @@ def test_flavor_list_long(self):
234242

235243
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
236244

237-
# DisplayCommandBase.take_action() returns two tuples
245+
# In base command class Lister in cliff, abstractmethod take_action()
246+
# returns a tuple containing the column names and an iterable
247+
# containing the data to be listed.
238248
columns, data = self.cmd.take_action(parsed_args)
239249

240250
# Set expected values

openstackclient/tests/compute/v2/test_security_group.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@ def test_security_group_list_no_options(self):
155155

156156
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
157157

158-
# DisplayCommandBase.take_action() returns two tuples
158+
# In base command class Lister in cliff, abstractmethod take_action()
159+
# returns a tuple containing the column names and an iterable
160+
# containing the data to be listed.
159161
columns, data = self.cmd.take_action(parsed_args)
160162

161163
# Set expected values

openstackclient/tests/compute/v2/test_security_group_rule.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,9 @@ def test_security_group_rule_list(self):
401401

402402
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
403403

404-
# DisplayCommandBase.take_action() returns two tuples
404+
# In base command class Lister in cliff, abstractmethod take_action()
405+
# returns a tuple containing the column names and an iterable
406+
# containing the data to be listed.
405407
columns, data = self.cmd.take_action(parsed_args)
406408

407409
collist = (
@@ -437,7 +439,9 @@ def test_security_group_rule_list_no_group(self):
437439

438440
parsed_args = self.check_parser(self.cmd, [], [])
439441

440-
# DisplayCommandBase.take_action() returns two tuples
442+
# In base command class Lister in cliff, abstractmethod take_action()
443+
# returns a tuple containing the column names and an iterable
444+
# containing the data to be listed.
441445
columns, data = self.cmd.take_action(parsed_args)
442446

443447
collist = (

openstackclient/tests/compute/v2/test_service.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ def test_service_list(self):
8181
]
8282
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
8383

84-
# DisplayCommandBase.take_action() returns two tuples
84+
# In base command class Lister in cliff, abstractmethod take_action()
85+
# returns a tuple containing the column names and an iterable
86+
# containing the data to be listed.
8587
self.cmd.take_action(parsed_args)
8688

8789
self.service_mock.list.assert_called_with(

0 commit comments

Comments
 (0)