openstack/kayobe
Code Issues Proposed changes

Merge "unit tests: Use assertListEqual and maxDiff = None"

Browse Source
This commit is contained in:
Zuul
2022-08-26 16:45:42 +00:00
committed by Gerrit Code Review
parent a2985978fa 4ba8903004
commit 51b8b6f43f
6 changed files with 125 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

204
kayobe/tests/unit/cli/test_commands.py
View File

@@ -34,6 +34,8 @@ class TestApp(cliff.app.App):
class TestCase(unittest.TestCase): class TestCase(unittest.TestCase):
maxDiff = None
@mock.patch.object(ansible, "install_galaxy_roles", autospec=True) @mock.patch.object(ansible, "install_galaxy_roles", autospec=True)
@mock.patch.object(ansible, "install_galaxy_collections", autospec=True) @mock.patch.object(ansible, "install_galaxy_collections", autospec=True)
@mock.patch.object(ansible, "passwords_yml_exists", autospec=True) @mock.patch.object(ansible, "passwords_yml_exists", autospec=True)
@@ -63,7 +65,7 @@ class TestCase(unittest.TestCase):
ignore_limit=True ignore_limit=True
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(ansible, "install_galaxy_roles", autospec=True) @mock.patch.object(ansible, "install_galaxy_roles", autospec=True)
@mock.patch.object(ansible, "install_galaxy_collections", autospec=True) @mock.patch.object(ansible, "install_galaxy_collections", autospec=True)
@@ -101,7 +103,7 @@ class TestCase(unittest.TestCase):
ignore_limit=True ignore_limit=True
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -109,7 +111,7 @@ class TestCase(unittest.TestCase):
"post-deploy", "post-deploy",
) )
] ]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list) self.assertListEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(ansible, "install_galaxy_roles", autospec=True) @mock.patch.object(ansible, "install_galaxy_roles", autospec=True)
@mock.patch.object(ansible, "install_galaxy_collections", autospec=True) @mock.patch.object(ansible, "install_galaxy_collections", autospec=True)
@@ -141,7 +143,7 @@ class TestCase(unittest.TestCase):
ignore_limit=True ignore_limit=True
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbook") "run_kayobe_playbook")
@@ -161,7 +163,7 @@ class TestCase(unittest.TestCase):
} }
) )
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbook") "run_kayobe_playbook")
@@ -181,7 +183,7 @@ class TestCase(unittest.TestCase):
} }
) )
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbook") "run_kayobe_playbook")
@@ -203,7 +205,7 @@ class TestCase(unittest.TestCase):
} }
) )
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbook") "run_kayobe_playbook")
@@ -225,7 +227,7 @@ class TestCase(unittest.TestCase):
} }
) )
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
def test_physical_network_configure_enable_disable_disco(self): def test_physical_network_configure_enable_disable_disco(self):
command = commands.PhysicalNetworkConfigure(TestApp(), []) command = commands.PhysicalNetworkConfigure(TestApp(), [])
@@ -256,7 +258,7 @@ class TestCase(unittest.TestCase):
} }
) )
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbook") "run_kayobe_playbook")
@@ -281,7 +283,7 @@ class TestCase(unittest.TestCase):
} }
) )
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -295,7 +297,7 @@ class TestCase(unittest.TestCase):
mock.call(mock.ANY, [utils.get_data_files_path( mock.call(mock.ANY, [utils.get_data_files_path(
"ansible", "network-connectivity.yml")]), "ansible", "network-connectivity.yml")]),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -322,7 +324,7 @@ class TestCase(unittest.TestCase):
limit="seed-hypervisor", limit="seed-hypervisor",
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -350,7 +352,7 @@ class TestCase(unittest.TestCase):
extra_vars={"wipe_disks": True}, extra_vars={"wipe_disks": True},
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -376,7 +378,7 @@ class TestCase(unittest.TestCase):
"show_output": True} "show_output": True}
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -402,7 +404,7 @@ class TestCase(unittest.TestCase):
}, },
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -428,7 +430,7 @@ class TestCase(unittest.TestCase):
}, },
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -454,7 +456,7 @@ class TestCase(unittest.TestCase):
}, },
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -476,7 +478,7 @@ class TestCase(unittest.TestCase):
limit="seed-hypervisor", limit="seed-hypervisor",
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -527,7 +529,7 @@ class TestCase(unittest.TestCase):
extra_vars={'kayobe_action': 'deploy'}, extra_vars={'kayobe_action': 'deploy'},
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -535,7 +537,7 @@ class TestCase(unittest.TestCase):
"bootstrap-servers", "bootstrap-servers",
), ),
] ]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list) self.assertListEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -589,7 +591,7 @@ class TestCase(unittest.TestCase):
] ]
print(expected_calls) print(expected_calls)
print(mock_run.call_args_list) print(mock_run.call_args_list)
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -597,7 +599,7 @@ class TestCase(unittest.TestCase):
"bootstrap-servers", "bootstrap-servers",
), ),
] ]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list) self.assertListEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -623,7 +625,7 @@ class TestCase(unittest.TestCase):
"show_output": True} "show_output": True}
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -649,7 +651,7 @@ class TestCase(unittest.TestCase):
}, },
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -675,7 +677,7 @@ class TestCase(unittest.TestCase):
}, },
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -701,7 +703,7 @@ class TestCase(unittest.TestCase):
}, },
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -723,7 +725,7 @@ class TestCase(unittest.TestCase):
limit="seed", limit="seed",
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -751,7 +753,7 @@ class TestCase(unittest.TestCase):
} }
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -778,7 +780,7 @@ class TestCase(unittest.TestCase):
} }
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -806,7 +808,7 @@ class TestCase(unittest.TestCase):
} }
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -827,7 +829,7 @@ class TestCase(unittest.TestCase):
extra_vars={}, extra_vars={},
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -848,7 +850,7 @@ class TestCase(unittest.TestCase):
extra_vars={"ipa_image_force_rebuild": True}, extra_vars={"ipa_image_force_rebuild": True},
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -890,7 +892,7 @@ class TestCase(unittest.TestCase):
], ],
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -898,7 +900,7 @@ class TestCase(unittest.TestCase):
"deploy-bifrost", "deploy-bifrost",
), ),
] ]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list) self.assertListEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -949,7 +951,7 @@ class TestCase(unittest.TestCase):
], ],
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -957,7 +959,7 @@ class TestCase(unittest.TestCase):
"upgrade-bifrost", "upgrade-bifrost",
), ),
] ]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list) self.assertListEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbook") "run_kayobe_playbook")
@@ -984,7 +986,7 @@ class TestCase(unittest.TestCase):
extra_vars={'infra_vm_limit': 'infra-vms'} extra_vars={'infra_vm_limit': 'infra-vms'}
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbook") "run_kayobe_playbook")
@@ -1005,7 +1007,7 @@ class TestCase(unittest.TestCase):
extra_vars={'infra_vm_limit': 'infra-vms'} extra_vars={'infra_vm_limit': 'infra-vms'}
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1032,7 +1034,7 @@ class TestCase(unittest.TestCase):
limit="infra-vms", limit="infra-vms",
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1060,7 +1062,7 @@ class TestCase(unittest.TestCase):
extra_vars={"wipe_disks": True}, extra_vars={"wipe_disks": True},
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1082,7 +1084,7 @@ class TestCase(unittest.TestCase):
limit="infra-vms", limit="infra-vms",
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1108,7 +1110,7 @@ class TestCase(unittest.TestCase):
"show_output": True} "show_output": True}
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1134,7 +1136,7 @@ class TestCase(unittest.TestCase):
}, },
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbook") "run_kayobe_playbook")
@@ -1147,7 +1149,7 @@ class TestCase(unittest.TestCase):
self.assertEqual(0, result) self.assertEqual(0, result)
expected_calls = [] expected_calls = []
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1172,7 +1174,7 @@ class TestCase(unittest.TestCase):
utils.get_data_files_path("ansible", "ip-allocation.yml"), utils.get_data_files_path("ansible", "ip-allocation.yml"),
), ),
] ]
self.assertEqual(expected_calls, mock_run_one.call_args_list) self.assertListEqual(expected_calls, mock_run_one.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -1182,7 +1184,7 @@ class TestCase(unittest.TestCase):
ignore_limit=True, ignore_limit=True,
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1205,7 +1207,7 @@ class TestCase(unittest.TestCase):
], ],
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1228,7 +1230,7 @@ class TestCase(unittest.TestCase):
], ],
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1249,7 +1251,7 @@ class TestCase(unittest.TestCase):
], ],
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1278,7 +1280,7 @@ class TestCase(unittest.TestCase):
ignore_limit=True, ignore_limit=True,
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -1286,7 +1288,7 @@ class TestCase(unittest.TestCase):
"gather-facts" "gather-facts"
), ),
] ]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list) self.assertListEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1332,7 +1334,7 @@ class TestCase(unittest.TestCase):
limit="overcloud", limit="overcloud",
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -1340,7 +1342,7 @@ class TestCase(unittest.TestCase):
"bootstrap-servers", "bootstrap-servers",
), ),
] ]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list) self.assertListEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1388,7 +1390,7 @@ class TestCase(unittest.TestCase):
limit="overcloud", limit="overcloud",
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -1396,7 +1398,7 @@ class TestCase(unittest.TestCase):
"bootstrap-servers", "bootstrap-servers",
), ),
] ]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list) self.assertListEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1422,7 +1424,7 @@ class TestCase(unittest.TestCase):
"show_output": True} "show_output": True}
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1448,7 +1450,7 @@ class TestCase(unittest.TestCase):
}, },
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1474,7 +1476,7 @@ class TestCase(unittest.TestCase):
}, },
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1500,7 +1502,7 @@ class TestCase(unittest.TestCase):
}, },
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1522,7 +1524,7 @@ class TestCase(unittest.TestCase):
limit="overcloud", limit="overcloud",
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1543,7 +1545,7 @@ class TestCase(unittest.TestCase):
ignore_limit=True, ignore_limit=True,
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -1552,7 +1554,7 @@ class TestCase(unittest.TestCase):
extra_args=[] extra_args=[]
), ),
] ]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list) self.assertListEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1574,7 +1576,7 @@ class TestCase(unittest.TestCase):
ignore_limit=True, ignore_limit=True,
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -1583,7 +1585,7 @@ class TestCase(unittest.TestCase):
extra_args=["--incremental"] extra_args=["--incremental"]
), ),
] ]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list) self.assertListEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1612,7 +1614,7 @@ class TestCase(unittest.TestCase):
ignore_limit=True, ignore_limit=True,
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -1621,7 +1623,7 @@ class TestCase(unittest.TestCase):
extra_vars={} extra_vars={}
), ),
] ]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list) self.assertListEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1651,7 +1653,7 @@ class TestCase(unittest.TestCase):
ignore_limit=True, ignore_limit=True,
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -1662,7 +1664,7 @@ class TestCase(unittest.TestCase):
} }
), ),
] ]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list) self.assertListEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1682,7 +1684,7 @@ class TestCase(unittest.TestCase):
extra_vars={} extra_vars={}
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1730,7 +1732,7 @@ class TestCase(unittest.TestCase):
ignore_limit=True, ignore_limit=True,
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -1746,7 +1748,7 @@ class TestCase(unittest.TestCase):
"post-deploy", "post-deploy",
), ),
] ]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list) self.assertListEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1788,7 +1790,7 @@ class TestCase(unittest.TestCase):
}, },
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -1800,7 +1802,7 @@ class TestCase(unittest.TestCase):
"deploy-containers", "deploy-containers",
), ),
] ]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list) self.assertListEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1830,7 +1832,7 @@ class TestCase(unittest.TestCase):
ignore_limit=True, ignore_limit=True,
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -1838,7 +1840,7 @@ class TestCase(unittest.TestCase):
"prechecks", "prechecks",
), ),
] ]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list) self.assertListEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1886,7 +1888,7 @@ class TestCase(unittest.TestCase):
ignore_limit=True, ignore_limit=True,
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -1902,7 +1904,7 @@ class TestCase(unittest.TestCase):
"post-deploy", "post-deploy",
), ),
] ]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list) self.assertListEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -1943,7 +1945,7 @@ class TestCase(unittest.TestCase):
}, },
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -1952,7 +1954,7 @@ class TestCase(unittest.TestCase):
extra_args=["--yes-i-really-really-mean-it"], extra_args=["--yes-i-really-really-mean-it"],
), ),
] ]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list) self.assertListEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2015,7 +2017,7 @@ class TestCase(unittest.TestCase):
ignore_limit=True, ignore_limit=True,
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
expected_calls = [ expected_calls = [
mock.call( mock.call(
@@ -2031,7 +2033,7 @@ class TestCase(unittest.TestCase):
"post-deploy" "post-deploy"
), ),
] ]
self.assertEqual(expected_calls, mock_kolla_run.call_args_list) self.assertListEqual(expected_calls, mock_kolla_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2061,7 +2063,7 @@ class TestCase(unittest.TestCase):
} }
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2089,7 +2091,7 @@ class TestCase(unittest.TestCase):
} }
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2116,7 +2118,7 @@ class TestCase(unittest.TestCase):
} }
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2138,7 +2140,7 @@ class TestCase(unittest.TestCase):
extra_vars={}, extra_vars={},
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2160,7 +2162,7 @@ class TestCase(unittest.TestCase):
extra_vars={"overcloud_host_image_force_rebuild": True}, extra_vars={"overcloud_host_image_force_rebuild": True},
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2182,7 +2184,7 @@ class TestCase(unittest.TestCase):
extra_vars={}, extra_vars={},
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2204,7 +2206,7 @@ class TestCase(unittest.TestCase):
extra_vars={"ipa_image_force_rebuild": True}, extra_vars={"ipa_image_force_rebuild": True},
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2233,7 +2235,7 @@ class TestCase(unittest.TestCase):
], ],
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2253,7 +2255,7 @@ class TestCase(unittest.TestCase):
], ],
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2272,7 +2274,7 @@ class TestCase(unittest.TestCase):
], ],
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2291,7 +2293,7 @@ class TestCase(unittest.TestCase):
], ],
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2310,7 +2312,7 @@ class TestCase(unittest.TestCase):
], ],
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2329,7 +2331,7 @@ class TestCase(unittest.TestCase):
], ],
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2352,7 +2354,7 @@ class TestCase(unittest.TestCase):
} }
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2378,7 +2380,7 @@ class TestCase(unittest.TestCase):
} }
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2401,7 +2403,7 @@ class TestCase(unittest.TestCase):
} }
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2427,7 +2429,7 @@ class TestCase(unittest.TestCase):
} }
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2449,7 +2451,7 @@ class TestCase(unittest.TestCase):
} }
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
@mock.patch.object(commands.KayobeAnsibleMixin, @mock.patch.object(commands.KayobeAnsibleMixin,
"run_kayobe_playbooks") "run_kayobe_playbooks")
@@ -2474,11 +2476,13 @@ class TestCase(unittest.TestCase):
} }
), ),
] ]
self.assertEqual(expected_calls, mock_run.call_args_list) self.assertListEqual(expected_calls, mock_run.call_args_list)
class TestHookDispatcher(unittest.TestCase): class TestHookDispatcher(unittest.TestCase):
maxDiff = None
@mock.patch('kayobe.cli.commands.os.path') @mock.patch('kayobe.cli.commands.os.path')
def test_hook_ordering(self, mock_path): def test_hook_ordering(self, mock_path):
mock_command = mock.MagicMock() mock_command = mock.MagicMock()

18
kayobe/tests/unit/test_ansible.py
View File

@@ -30,6 +30,8 @@ from kayobe import vault
@mock.patch.dict(os.environ, clear=True) @mock.patch.dict(os.environ, clear=True)
class TestCase(unittest.TestCase): class TestCase(unittest.TestCase):
maxDiff = None
@mock.patch.object(utils, "run_command") @mock.patch.object(utils, "run_command")
@mock.patch.object(ansible, "_get_vars_files") @mock.patch.object(ansible, "_get_vars_files")
@mock.patch.object(ansible, "_validate_args") @mock.patch.object(ansible, "_validate_args")
@@ -157,7 +159,7 @@ class TestCase(unittest.TestCase):
mock.call(expected_cmd, check_output=False, quiet=False, mock.call(expected_cmd, check_output=False, quiet=False,
env=expected_env) env=expected_env)
] ]
self.assertEqual(expected_calls, mock_run.mock_calls) self.assertListEqual(expected_calls, mock_run.mock_calls)
mock_vars.assert_called_once_with( mock_vars.assert_called_once_with(
["/path/to/config", "/path/to/config/environments/test-env"]) ["/path/to/config", "/path/to/config/environments/test-env"])
@@ -477,7 +479,7 @@ class TestCase(unittest.TestCase):
force=False), force=False),
mock.call("/etc/kayobe/ansible/requirements.yml", mock.call("/etc/kayobe/ansible/requirements.yml",
"/etc/kayobe/ansible/roles", force=False)] "/etc/kayobe/ansible/roles", force=False)]
self.assertEqual(expected_calls, mock_install.call_args_list) self.assertListEqual(expected_calls, mock_install.call_args_list)
mock_is_readable.assert_called_once_with( mock_is_readable.assert_called_once_with(
"/etc/kayobe/ansible/requirements.yml") "/etc/kayobe/ansible/requirements.yml")
mock_mkdirs.assert_called_once_with("/etc/kayobe/ansible/roles") mock_mkdirs.assert_called_once_with("/etc/kayobe/ansible/roles")
@@ -500,7 +502,7 @@ class TestCase(unittest.TestCase):
force=True), force=True),
mock.call("/etc/kayobe/ansible/requirements.yml", mock.call("/etc/kayobe/ansible/requirements.yml",
"/etc/kayobe/ansible/roles", force=True)] "/etc/kayobe/ansible/roles", force=True)]
self.assertEqual(expected_calls, mock_install.call_args_list) self.assertListEqual(expected_calls, mock_install.call_args_list)
mock_is_readable.assert_called_once_with( mock_is_readable.assert_called_once_with(
"/etc/kayobe/ansible/requirements.yml") "/etc/kayobe/ansible/requirements.yml")
mock_mkdirs.assert_called_once_with("/etc/kayobe/ansible/roles") mock_mkdirs.assert_called_once_with("/etc/kayobe/ansible/roles")
@@ -563,7 +565,7 @@ class TestCase(unittest.TestCase):
force=False), force=False),
mock.call("/etc/kayobe/ansible/requirements.yml", mock.call("/etc/kayobe/ansible/requirements.yml",
"/etc/kayobe/ansible/collections", force=False)] "/etc/kayobe/ansible/collections", force=False)]
self.assertEqual(expected_calls, mock_install.call_args_list) self.assertListEqual(expected_calls, mock_install.call_args_list)
mock_is_readable.assert_called_once_with( mock_is_readable.assert_called_once_with(
"/etc/kayobe/ansible/requirements.yml") "/etc/kayobe/ansible/requirements.yml")
mock_mkdirs.assert_called_once_with("/etc/kayobe/ansible/collections") mock_mkdirs.assert_called_once_with("/etc/kayobe/ansible/collections")
@@ -586,7 +588,7 @@ class TestCase(unittest.TestCase):
force=True), force=True),
mock.call("/etc/kayobe/ansible/requirements.yml", mock.call("/etc/kayobe/ansible/requirements.yml",
"/etc/kayobe/ansible/collections", force=True)] "/etc/kayobe/ansible/collections", force=True)]
self.assertEqual(expected_calls, mock_install.call_args_list) self.assertListEqual(expected_calls, mock_install.call_args_list)
mock_is_readable.assert_called_once_with( mock_is_readable.assert_called_once_with(
"/etc/kayobe/ansible/requirements.yml") "/etc/kayobe/ansible/requirements.yml")
mock_mkdirs.assert_called_once_with("/etc/kayobe/ansible/collections") mock_mkdirs.assert_called_once_with("/etc/kayobe/ansible/collections")
@@ -715,7 +717,7 @@ class TestCase(unittest.TestCase):
mock.call("/etc/kayobe/environments/test-env/inventory"), mock.call("/etc/kayobe/environments/test-env/inventory"),
mock.call("/etc/kayobe/ansible.cfg"), mock.call("/etc/kayobe/ansible.cfg"),
] ]
self.assertEqual(expected_calls, mock_exists.mock_calls) self.assertListEqual(expected_calls, mock_exists.mock_calls)
mock_run.assert_called_once_with(expected_cmd, check_output=False, mock_run.assert_called_once_with(expected_cmd, check_output=False,
quiet=False, env=expected_env) quiet=False, env=expected_env)
mock_vars.assert_called_once_with( mock_vars.assert_called_once_with(
@@ -754,7 +756,7 @@ class TestCase(unittest.TestCase):
mock.call("/etc/kayobe/environments/test-env/inventory"), mock.call("/etc/kayobe/environments/test-env/inventory"),
mock.call("/etc/kayobe/ansible.cfg"), mock.call("/etc/kayobe/ansible.cfg"),
] ]
self.assertEqual(expected_calls, mock_exists.mock_calls) self.assertListEqual(expected_calls, mock_exists.mock_calls)
mock_run.assert_called_once_with(expected_cmd, check_output=False, mock_run.assert_called_once_with(expected_cmd, check_output=False,
quiet=False, env=expected_env) quiet=False, env=expected_env)
mock_vars.assert_called_once_with( mock_vars.assert_called_once_with(
@@ -793,7 +795,7 @@ class TestCase(unittest.TestCase):
mock.call("/etc/kayobe/environments/test-env/inventory"), mock.call("/etc/kayobe/environments/test-env/inventory"),
mock.call("/etc/kayobe/ansible.cfg"), mock.call("/etc/kayobe/ansible.cfg"),
] ]
self.assertEqual(expected_calls, mock_exists.mock_calls) self.assertListEqual(expected_calls, mock_exists.mock_calls)
mock_run.assert_called_once_with(expected_cmd, check_output=False, mock_run.assert_called_once_with(expected_cmd, check_output=False,
quiet=False, env=expected_env) quiet=False, env=expected_env)
mock_vars.assert_called_once_with( mock_vars.assert_called_once_with(

4
kayobe/tests/unit/test_environment.py
View File

@@ -24,6 +24,8 @@ from kayobe import utils
class TestCase(unittest.TestCase): class TestCase(unittest.TestCase):
maxDiff = None
@mock.patch.object(utils, "is_readable_dir") @mock.patch.object(utils, "is_readable_dir")
def test_unreadable_environments_directory(self, mock_readable_dir): def test_unreadable_environments_directory(self, mock_readable_dir):
mock_readable_dir.return_value = { mock_readable_dir.return_value = {
@@ -78,7 +80,7 @@ class TestCase(unittest.TestCase):
mock.call("/path/to/config/environments"), mock.call("/path/to/config/environments"),
mock.call("/path/to/config/environments/foo"), mock.call("/path/to/config/environments/foo"),
] ]
self.assertEqual(expected_calls, mock_mkdir.call_args_list) self.assertListEqual(expected_calls, mock_mkdir.call_args_list)
mock_copy_dir.assert_called_once_with( mock_copy_dir.assert_called_once_with(
"/path/to/foo", "/path/to/config/environments/foo", "/path/to/foo", "/path/to/config/environments/foo",
exclude=["environments"]) exclude=["environments"])

6
kayobe/tests/unit/test_kolla_ansible.py
View File

@@ -28,6 +28,8 @@ from kayobe import vault
@mock.patch.dict(os.environ, clear=True) @mock.patch.dict(os.environ, clear=True)
class TestCase(unittest.TestCase): class TestCase(unittest.TestCase):
maxDiff = None
@mock.patch.object(utils, "run_command") @mock.patch.object(utils, "run_command")
@mock.patch.object(kolla_ansible, "_validate_args") @mock.patch.object(kolla_ansible, "_validate_args")
def test_run(self, mock_validate, mock_run): def test_run(self, mock_validate, mock_run):
@@ -126,7 +128,7 @@ class TestCase(unittest.TestCase):
check_output=True, universal_newlines=True), check_output=True, universal_newlines=True),
mock.call(expected_cmd, shell=True, quiet=False, env=expected_env) mock.call(expected_cmd, shell=True, quiet=False, env=expected_env)
] ]
self.assertEqual(expected_calls, mock_run.mock_calls) self.assertListEqual(expected_calls, mock_run.mock_calls)
@mock.patch.object(utils, "run_command") @mock.patch.object(utils, "run_command")
@mock.patch.object(kolla_ansible, "_validate_args") @mock.patch.object(kolla_ansible, "_validate_args")
@@ -263,7 +265,7 @@ class TestCase(unittest.TestCase):
mock.call("/etc/kayobe/kolla/ansible.cfg"), mock.call("/etc/kayobe/kolla/ansible.cfg"),
mock.call("/etc/kayobe/ansible.cfg"), mock.call("/etc/kayobe/ansible.cfg"),
] ]
self.assertEqual(mock_readable.call_args_list, expected_calls) self.assertListEqual(mock_readable.call_args_list, expected_calls)
@mock.patch.object(utils, "run_command") @mock.patch.object(utils, "run_command")
@mock.patch.object(utils, "is_readable_file") @mock.patch.object(utils, "is_readable_file")

2
kayobe/tests/unit/test_utils.py
View File

@@ -25,6 +25,8 @@ from kayobe import utils
class TestCase(unittest.TestCase): class TestCase(unittest.TestCase):
maxDiff = None
@mock.patch.object(utils, "run_command") @mock.patch.object(utils, "run_command")
def test_galaxy_role_install(self, mock_run): def test_galaxy_role_install(self, mock_run):
utils.galaxy_role_install("/path/to/role/file", "/path/to/roles") utils.galaxy_role_install("/path/to/role/file", "/path/to/roles")

2
kayobe/tests/unit/test_vault.py
View File

@@ -23,6 +23,8 @@ from kayobe import vault
class TestCase(unittest.TestCase): class TestCase(unittest.TestCase):
maxDiff = None
@mock.patch.object(vault.utils, "run_command", autospec=True) @mock.patch.object(vault.utils, "run_command", autospec=True)
def test__get_vault_password_helper(self, mock_run): def test__get_vault_password_helper(self, mock_run):
mock_run.return_value = "fake-password\n" mock_run.return_value = "fake-password\n"