zuul
/
nodepool
Code Issues Proposed changes

Simplify command test asserts 

We had some very specific assert functions for command testing make a
generic method to handle both cases and simplify the exisitng asserts.

This makes future testing of commands easier to assert state of.

Change-Id: I8fd4397e9b444d05a7ece4c81e5b6f0bca8cfdc6
This commit is contained in:
Clark Boylan 2015-09-30 14:52:17 -07:00 committed by Gregory Haynes
parent 67aba1c79b
commit 73684dfe79
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nodepool/tests/test_commands.py
View File

@ -29,33 +29,23 @@ class TestNodepoolCMD(tests.DBTestCase):
argv.extend(args)
self.useFixture(fixtures.MonkeyPatch('sys.argv', argv))
def assert_images_listed(self, configfile, image_cnt, status="ready"):
self.patch_argv("-c", configfile, "image-list")
def assert_listed(self, configfile, cmd, col, val, count):
self.patch_argv("-c", configfile, cmd)
with mock.patch('prettytable.PrettyTable.add_row') as m_add_row:
nodepoolcmd.main()
images_with_status = 0
rows_with_val = 0
# Find add_rows with the status were looking for
for args, kwargs in m_add_row.call_args_list:
row = args[0]
status_column = 7
if row[status_column] == status:
images_with_status += 1
self.assertEquals(images_with_status, image_cnt)
if row[col] == val:
rows_with_val += 1
self.assertEquals(rows_with_val, count)
def assert_images_listed(self, configfile, image_cnt, status="ready"):
self.assert_listed(configfile, 'image-list', 7, status, image_cnt)
def assert_nodes_listed(self, configfile, node_cnt, status="ready"):
self.patch_argv("-c", configfile, "list")
with mock.patch('prettytable.PrettyTable.add_row') as m_add_row:
nodepoolcmd.main()
nodes_with_status = 0
# Find add_rows with the status were looking for
for args, kwargs in m_add_row.call_args_list:
row = args[0]
# this is the major difference between the two assert
# functions.
status_column = 9
if row[status_column] == status:
nodes_with_status += 1
self.assertEquals(nodes_with_status, node_cnt)
self.assert_listed(configfile, 'list', 9, status, node_cnt)
def test_snapshot_image_update(self):
configfile = self.setup_config("node.yaml")