From 60746c3d758fc6cf6a9fbba04db809c544ee64e5 Mon Sep 17 00:00:00 2001 From: Erick Sapp Date: Sun, 27 May 2018 15:36:02 -0500 Subject: [PATCH 01/10] Finished unit tests for CLI/virt/power --- tests/CLI/modules/vs_tests.py | 92 +++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/tests/CLI/modules/vs_tests.py b/tests/CLI/modules/vs_tests.py index 1117770d3..8b2ba6dbd 100644 --- a/tests/CLI/modules/vs_tests.py +++ b/tests/CLI/modules/vs_tests.py @@ -15,6 +15,98 @@ class VirtTests(testing.TestCase): + @mock.patch('SoftLayer.CLI.formatting.confirm') + def test_rescue_vs(self, confirm_mock): + confirm_mock.return_value = True + result = self.run_command(['vs', 'rescue', '100']) + + self.assert_no_fail(result) + + @mock.patch('SoftLayer.CLI.formatting.confirm') + def test_rescue_vs_no_confirm(self, confirm_mock): + confirm_mock.return_value = False + result = self.run_command(['vs', 'rescue', '100']) + + self.assertEqual(result.exit_code, 2) + + @mock.patch('SoftLayer.CLI.formatting.confirm') + def test_reboot_default_vs(self, confirm_mock): + mock = self.set_mock('SoftLayer_Virtual_Guest', 'rebootDefault') + mock.return_value = 'true' + confirm_mock.return_value = True + result = self.run_command(['vs', 'reboot', '100']) + + self.assert_no_fail(result) + + @mock.patch('SoftLayer.CLI.formatting.confirm') + def test_reboot_soft_vs(self, confirm_mock): + mock = self.set_mock('SoftLayer_Virtual_Guest', 'rebootSoft') + mock.return_value = 'true' + confirm_mock.return_value = True + + result = self.run_command(['vs', 'reboot', '--soft', '100']) + + self.assert_no_fail(result) + + @mock.patch('SoftLayer.CLI.formatting.confirm') + def test_reboot_hard_vs(self, confirm_mock): + mock = self.set_mock('SoftLayer_Virtual_Guest', 'rebootHard') + mock.return_value = 'true' + confirm_mock.return_value = True + result = self.run_command(['vs', 'reboot', '--hard', '100']) + + self.assert_no_fail(result) + + @mock.patch('SoftLayer.CLI.formatting.confirm') + def test_power_off_soft_vs(self, confirm_mock): + mock = self.set_mock('SoftLayer_Virtual_Guest', 'powerOffSoft') + mock.return_value = 'true' + confirm_mock.return_value = True + + result = self.run_command(['vs', 'power-off', '100']) + + self.assert_no_fail(result) + + @mock.patch('SoftLayer.CLI.formatting.confirm') + def test_power_off_hard_vs(self, confirm_mock): + mock = self.set_mock('SoftLayer_Virtual_Guest', 'powerOff') + mock.return_value = 'true' + confirm_mock.return_value = True + + result = self.run_command(['vs', 'power-off', '--hard', '100']) + + self.assert_no_fail(result) + + @mock.patch('SoftLayer.CLI.formatting.confirm') + def test_power_on_vs(self, confirm_mock): + mock = self.set_mock('SoftLayer_Virtual_Guest', 'powerOn') + mock.return_value = 'true' + confirm_mock.return_value = True + + result = self.run_command(['vs', 'power-on', '100']) + + self.assert_no_fail(result) + + @mock.patch('SoftLayer.CLI.formatting.confirm') + def test_pause_vs(self, confirm_mock): + mock = self.set_mock('SoftLayer_Virtual_Guest', 'pause') + mock.return_value = 'true' + confirm_mock.return_value = True + + result = self.run_command(['vs', 'pause', '100']) + + self.assert_no_fail(result) + + @mock.patch('SoftLayer.CLI.formatting.confirm') + def test_resume_vs(self, confirm_mock): + mock = self.set_mock('SoftLayer_Virtual_Guest', 'resume') + mock.return_value = 'true' + confirm_mock.return_value = True + + result = self.run_command(['vs', 'resume', '100']) + + self.assert_no_fail(result) + def test_list_vs(self): result = self.run_command(['vs', 'list', '--tag=tag']) From ce98dd656e3d89f5a53465ff5254cf803d31a21c Mon Sep 17 00:00:00 2001 From: Erick Sapp Date: Sun, 27 May 2018 17:55:35 -0500 Subject: [PATCH 02/10] Fix to reach lines 43, 66, and 97 of power.py --- tests/CLI/modules/vs_tests.py | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tests/CLI/modules/vs_tests.py b/tests/CLI/modules/vs_tests.py index 8b2ba6dbd..7e624acd8 100644 --- a/tests/CLI/modules/vs_tests.py +++ b/tests/CLI/modules/vs_tests.py @@ -38,6 +38,15 @@ def test_reboot_default_vs(self, confirm_mock): self.assert_no_fail(result) + @mock.patch('SoftLayer.CLI.formatting.confirm') + def test_reboot_no_confirm_vs(self, confirm_mock): + mock = self.set_mock('SoftLayer_Virtual_Guest', 'rebootDefault') + mock.return_value = 'true' + confirm_mock.return_value = False + result = self.run_command(['vs', 'reboot', '100']) + + self.assertEqual(result.exit_code, 2) + @mock.patch('SoftLayer.CLI.formatting.confirm') def test_reboot_soft_vs(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'rebootSoft') @@ -66,6 +75,16 @@ def test_power_off_soft_vs(self, confirm_mock): result = self.run_command(['vs', 'power-off', '100']) self.assert_no_fail(result) + + @mock.patch('SoftLayer.CLI.formatting.confirm') + def test_power_off_no_confirm_vs(self, confirm_mock): + mock = self.set_mock('SoftLayer_Virtual_Guest', 'powerOffSoft') + mock.return_value = 'true' + confirm_mock.return_value = False + + result = self.run_command(['vs', 'power-off', '100']) + + self.assertEqual(result.exit_code, 2) @mock.patch('SoftLayer.CLI.formatting.confirm') def test_power_off_hard_vs(self, confirm_mock): @@ -97,6 +116,16 @@ def test_pause_vs(self, confirm_mock): self.assert_no_fail(result) + @mock.patch('SoftLayer.CLI.formatting.confirm') + def test_pause_vs(self, confirm_mock): + mock = self.set_mock('SoftLayer_Virtual_Guest', 'pause') + mock.return_value = 'true' + confirm_mock.return_value = False + + result = self.run_command(['vs', 'pause', '100']) + + self.assertEqual(result.exit_code, 2) + @mock.patch('SoftLayer.CLI.formatting.confirm') def test_resume_vs(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'resume') From 15214c157f8f048bd8866128c1cf8633c6f4f160 Mon Sep 17 00:00:00 2001 From: Erick Sapp Date: Sun, 27 May 2018 18:12:58 -0500 Subject: [PATCH 03/10] Renaming. --- tests/CLI/modules/vs_tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/CLI/modules/vs_tests.py b/tests/CLI/modules/vs_tests.py index 7e624acd8..65230e7eb 100644 --- a/tests/CLI/modules/vs_tests.py +++ b/tests/CLI/modules/vs_tests.py @@ -23,7 +23,7 @@ def test_rescue_vs(self, confirm_mock): self.assert_no_fail(result) @mock.patch('SoftLayer.CLI.formatting.confirm') - def test_rescue_vs_no_confirm(self, confirm_mock): + def test_rescue_no_confirm_vs(self, confirm_mock): confirm_mock.return_value = False result = self.run_command(['vs', 'rescue', '100']) @@ -135,7 +135,7 @@ def test_resume_vs(self, confirm_mock): result = self.run_command(['vs', 'resume', '100']) self.assert_no_fail(result) - + def test_list_vs(self): result = self.run_command(['vs', 'list', '--tag=tag']) From 4b13718226579d511f902348fdeb437921d6f188 Mon Sep 17 00:00:00 2001 From: Erick Sapp Date: Sun, 27 May 2018 18:19:17 -0500 Subject: [PATCH 04/10] Fixed extra whitespace. --- tests/CLI/modules/vs_tests.py | 50 +++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/CLI/modules/vs_tests.py b/tests/CLI/modules/vs_tests.py index 65230e7eb..a143e3dbd 100644 --- a/tests/CLI/modules/vs_tests.py +++ b/tests/CLI/modules/vs_tests.py @@ -19,14 +19,14 @@ class VirtTests(testing.TestCase): def test_rescue_vs(self, confirm_mock): confirm_mock.return_value = True result = self.run_command(['vs', 'rescue', '100']) - + self.assert_no_fail(result) - + @mock.patch('SoftLayer.CLI.formatting.confirm') def test_rescue_no_confirm_vs(self, confirm_mock): confirm_mock.return_value = False result = self.run_command(['vs', 'rescue', '100']) - + self.assertEqual(result.exit_code, 2) @mock.patch('SoftLayer.CLI.formatting.confirm') @@ -35,7 +35,7 @@ def test_reboot_default_vs(self, confirm_mock): mock.return_value = 'true' confirm_mock.return_value = True result = self.run_command(['vs', 'reboot', '100']) - + self.assert_no_fail(result) @mock.patch('SoftLayer.CLI.formatting.confirm') @@ -44,34 +44,34 @@ def test_reboot_no_confirm_vs(self, confirm_mock): mock.return_value = 'true' confirm_mock.return_value = False result = self.run_command(['vs', 'reboot', '100']) - + self.assertEqual(result.exit_code, 2) - + @mock.patch('SoftLayer.CLI.formatting.confirm') def test_reboot_soft_vs(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'rebootSoft') mock.return_value = 'true' confirm_mock.return_value = True - + result = self.run_command(['vs', 'reboot', '--soft', '100']) - + self.assert_no_fail(result) - + @mock.patch('SoftLayer.CLI.formatting.confirm') def test_reboot_hard_vs(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'rebootHard') mock.return_value = 'true' confirm_mock.return_value = True result = self.run_command(['vs', 'reboot', '--hard', '100']) - + self.assert_no_fail(result) - + @mock.patch('SoftLayer.CLI.formatting.confirm') def test_power_off_soft_vs(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'powerOffSoft') mock.return_value = 'true' confirm_mock.return_value = True - + result = self.run_command(['vs', 'power-off', '100']) self.assert_no_fail(result) @@ -81,11 +81,11 @@ def test_power_off_no_confirm_vs(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'powerOffSoft') mock.return_value = 'true' confirm_mock.return_value = False - + result = self.run_command(['vs', 'power-off', '100']) - + self.assertEqual(result.exit_code, 2) - + @mock.patch('SoftLayer.CLI.formatting.confirm') def test_power_off_hard_vs(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'powerOff') @@ -95,15 +95,15 @@ def test_power_off_hard_vs(self, confirm_mock): result = self.run_command(['vs', 'power-off', '--hard', '100']) self.assert_no_fail(result) - + @mock.patch('SoftLayer.CLI.formatting.confirm') def test_power_on_vs(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'powerOn') mock.return_value = 'true' confirm_mock.return_value = True - + result = self.run_command(['vs', 'power-on', '100']) - + self.assert_no_fail(result) @mock.patch('SoftLayer.CLI.formatting.confirm') @@ -111,9 +111,9 @@ def test_pause_vs(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'pause') mock.return_value = 'true' confirm_mock.return_value = True - + result = self.run_command(['vs', 'pause', '100']) - + self.assert_no_fail(result) @mock.patch('SoftLayer.CLI.formatting.confirm') @@ -121,19 +121,19 @@ def test_pause_vs(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'pause') mock.return_value = 'true' confirm_mock.return_value = False - + result = self.run_command(['vs', 'pause', '100']) - + self.assertEqual(result.exit_code, 2) - + @mock.patch('SoftLayer.CLI.formatting.confirm') def test_resume_vs(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'resume') mock.return_value = 'true' confirm_mock.return_value = True - + result = self.run_command(['vs', 'resume', '100']) - + self.assert_no_fail(result) def test_list_vs(self): From b0822769ba7048893718ac0cfc2f04c75484f48f Mon Sep 17 00:00:00 2001 From: Erick Sapp Date: Sun, 27 May 2018 18:34:48 -0500 Subject: [PATCH 05/10] Fix style on vs_tests.py . --- tests/CLI/modules/vs_tests.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/CLI/modules/vs_tests.py b/tests/CLI/modules/vs_tests.py index a143e3dbd..8340a940d 100644 --- a/tests/CLI/modules/vs_tests.py +++ b/tests/CLI/modules/vs_tests.py @@ -23,7 +23,7 @@ def test_rescue_vs(self, confirm_mock): self.assert_no_fail(result) @mock.patch('SoftLayer.CLI.formatting.confirm') - def test_rescue_no_confirm_vs(self, confirm_mock): + def test_rescue_no_confirm_vs(self, confirm_mock): confirm_mock.return_value = False result = self.run_command(['vs', 'rescue', '100']) @@ -45,7 +45,7 @@ def test_reboot_no_confirm_vs(self, confirm_mock): confirm_mock.return_value = False result = self.run_command(['vs', 'reboot', '100']) - self.assertEqual(result.exit_code, 2) + self.assertEqual(result.exit_code, 2) @mock.patch('SoftLayer.CLI.formatting.confirm') def test_reboot_soft_vs(self, confirm_mock): @@ -64,7 +64,7 @@ def test_reboot_hard_vs(self, confirm_mock): confirm_mock.return_value = True result = self.run_command(['vs', 'reboot', '--hard', '100']) - self.assert_no_fail(result) + self.assert_no_fail(result) @mock.patch('SoftLayer.CLI.formatting.confirm') def test_power_off_soft_vs(self, confirm_mock): @@ -84,7 +84,7 @@ def test_power_off_no_confirm_vs(self, confirm_mock): result = self.run_command(['vs', 'power-off', '100']) - self.assertEqual(result.exit_code, 2) + self.assertEqual(result.exit_code, 2) @mock.patch('SoftLayer.CLI.formatting.confirm') def test_power_off_hard_vs(self, confirm_mock): @@ -117,14 +117,14 @@ def test_pause_vs(self, confirm_mock): self.assert_no_fail(result) @mock.patch('SoftLayer.CLI.formatting.confirm') - def test_pause_vs(self, confirm_mock): + def test_pause_no_confirm_vs(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'pause') mock.return_value = 'true' confirm_mock.return_value = False result = self.run_command(['vs', 'pause', '100']) - self.assertEqual(result.exit_code, 2) + self.assertEqual(result.exit_code, 2) @mock.patch('SoftLayer.CLI.formatting.confirm') def test_resume_vs(self, confirm_mock): @@ -134,7 +134,7 @@ def test_resume_vs(self, confirm_mock): result = self.run_command(['vs', 'resume', '100']) - self.assert_no_fail(result) + self.assert_no_fail(result) def test_list_vs(self): result = self.run_command(['vs', 'list', '--tag=tag']) From 415bdba500480ba76ac0526a47e5275eba76cd95 Mon Sep 17 00:00:00 2001 From: Erick Sapp Date: Sun, 27 May 2018 18:43:18 -0500 Subject: [PATCH 06/10] Fixed tox analysis. --- tests/CLI/helper_tests.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/CLI/helper_tests.py b/tests/CLI/helper_tests.py index e6bbfe52d..fec78a9d2 100644 --- a/tests/CLI/helper_tests.py +++ b/tests/CLI/helper_tests.py @@ -252,16 +252,19 @@ def test_init(self): class ResolveIdTests(testing.TestCase): def test_resolve_id_one(self): - resolver = lambda r: [12345] + def resolver(): + return [12345] self.assertEqual(helpers.resolve_id(resolver, 'test'), 12345) def test_resolve_id_none(self): - resolver = lambda r: [] + def resolver(): + return [] self.assertRaises( exceptions.CLIAbort, helpers.resolve_id, resolver, 'test') def test_resolve_id_multiple(self): - resolver = lambda r: [12345, 54321] + def resolver(): + return [12345, 54321] self.assertRaises( exceptions.CLIAbort, helpers.resolve_id, resolver, 'test') From 7c8a1ce64248954c20f0674fd58546d7ab7f800c Mon Sep 17 00:00:00 2001 From: Erick Sapp Date: Sun, 27 May 2018 18:47:00 -0500 Subject: [PATCH 07/10] Added argument to local functions. --- tests/CLI/helper_tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/CLI/helper_tests.py b/tests/CLI/helper_tests.py index fec78a9d2..b79251852 100644 --- a/tests/CLI/helper_tests.py +++ b/tests/CLI/helper_tests.py @@ -252,18 +252,18 @@ def test_init(self): class ResolveIdTests(testing.TestCase): def test_resolve_id_one(self): - def resolver(): + def resolver(r): return [12345] self.assertEqual(helpers.resolve_id(resolver, 'test'), 12345) def test_resolve_id_none(self): - def resolver(): + def resolver(r): return [] self.assertRaises( exceptions.CLIAbort, helpers.resolve_id, resolver, 'test') def test_resolve_id_multiple(self): - def resolver(): + def resolver(r): return [12345, 54321] self.assertRaises( exceptions.CLIAbort, helpers.resolve_id, resolver, 'test') From 9aaeec866b170adc2b667587dff472152c87e318 Mon Sep 17 00:00:00 2001 From: Erick Sapp Date: Tue, 29 May 2018 15:12:47 -0500 Subject: [PATCH 08/10] Added tests for SoftLayer/CLI/virt/reload.py --- tests/CLI/modules/vs_tests.py | 36 +++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/tests/CLI/modules/vs_tests.py b/tests/CLI/modules/vs_tests.py index 8340a940d..e5226eb8c 100644 --- a/tests/CLI/modules/vs_tests.py +++ b/tests/CLI/modules/vs_tests.py @@ -23,14 +23,14 @@ def test_rescue_vs(self, confirm_mock): self.assert_no_fail(result) @mock.patch('SoftLayer.CLI.formatting.confirm') - def test_rescue_no_confirm_vs(self, confirm_mock): + def test_rescue_vs_no_confirm(self, confirm_mock): confirm_mock.return_value = False result = self.run_command(['vs', 'rescue', '100']) self.assertEqual(result.exit_code, 2) @mock.patch('SoftLayer.CLI.formatting.confirm') - def test_reboot_default_vs(self, confirm_mock): + def test_reboot_vs_default(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'rebootDefault') mock.return_value = 'true' confirm_mock.return_value = True @@ -39,7 +39,7 @@ def test_reboot_default_vs(self, confirm_mock): self.assert_no_fail(result) @mock.patch('SoftLayer.CLI.formatting.confirm') - def test_reboot_no_confirm_vs(self, confirm_mock): + def test_reboot_vs_no_confirm(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'rebootDefault') mock.return_value = 'true' confirm_mock.return_value = False @@ -48,7 +48,7 @@ def test_reboot_no_confirm_vs(self, confirm_mock): self.assertEqual(result.exit_code, 2) @mock.patch('SoftLayer.CLI.formatting.confirm') - def test_reboot_soft_vs(self, confirm_mock): + def test_reboot_vs_soft(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'rebootSoft') mock.return_value = 'true' confirm_mock.return_value = True @@ -58,7 +58,7 @@ def test_reboot_soft_vs(self, confirm_mock): self.assert_no_fail(result) @mock.patch('SoftLayer.CLI.formatting.confirm') - def test_reboot_hard_vs(self, confirm_mock): + def test_reboot_vs_hard(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'rebootHard') mock.return_value = 'true' confirm_mock.return_value = True @@ -67,7 +67,7 @@ def test_reboot_hard_vs(self, confirm_mock): self.assert_no_fail(result) @mock.patch('SoftLayer.CLI.formatting.confirm') - def test_power_off_soft_vs(self, confirm_mock): + def test_power_vs_off_soft(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'powerOffSoft') mock.return_value = 'true' confirm_mock.return_value = True @@ -77,7 +77,7 @@ def test_power_off_soft_vs(self, confirm_mock): self.assert_no_fail(result) @mock.patch('SoftLayer.CLI.formatting.confirm') - def test_power_off_no_confirm_vs(self, confirm_mock): + def test_power_off_vs_no_confirm(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'powerOffSoft') mock.return_value = 'true' confirm_mock.return_value = False @@ -87,7 +87,7 @@ def test_power_off_no_confirm_vs(self, confirm_mock): self.assertEqual(result.exit_code, 2) @mock.patch('SoftLayer.CLI.formatting.confirm') - def test_power_off_hard_vs(self, confirm_mock): + def test_power_off_vs_hard(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'powerOff') mock.return_value = 'true' confirm_mock.return_value = True @@ -117,7 +117,7 @@ def test_pause_vs(self, confirm_mock): self.assert_no_fail(result) @mock.patch('SoftLayer.CLI.formatting.confirm') - def test_pause_no_confirm_vs(self, confirm_mock): + def test_pause_vs_no_confirm(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'pause') mock.return_value = 'true' confirm_mock.return_value = False @@ -153,7 +153,7 @@ def test_list_vs(self): 'action': None, 'id': 104, 'backend_ip': '10.45.19.35'}]) - + def test_detail_vs(self): result = self.run_command(['vs', 'detail', '100', '--passwords', '--price']) @@ -783,3 +783,19 @@ def test_going_ready(self, _sleep): result = self.run_command(['vs', 'ready', '100', '--wait=100']) self.assert_no_fail(result) self.assertEqual(result.output, '"READY"\n') + + @mock.patch('SoftLayer.CLI.formatting.no_going_back') + def test_reload(self, confirm_mock): + mock = self.set_mock('SoftLayer_Virtual_Guest', 'reloadCurrentOperatingSystemConfguration') + confirm_mock.return_value = True + + result = self.run_command(['vs', 'reload', '--postinstall', '100', '--key', '100', '--image', '100', '100']) + self.assert_no_fail(result) + + @mock.patch('SoftLayer.CLI.formatting.no_going_back') + def test_reload_no_confirm(self, confirm_mock): + mock = self.set_mock('SoftLayer_Virtual_Guest', 'reloadCurrentOperatingSystemConfiguration') + confirm_mock.return_value = False + + result = self.run_command(['vs', 'reload', '--postinstall', '100', '--key', '100', '--image', '100', '100']) + self.assertEqual(result.exit_code, 2) From f98447b1fcb9f13359db220f8b71c295de806c48 Mon Sep 17 00:00:00 2001 From: Erick Sapp Date: Tue, 29 May 2018 15:21:15 -0500 Subject: [PATCH 09/10] Fixed style and unused mock objects. --- tests/CLI/modules/vs_tests.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/CLI/modules/vs_tests.py b/tests/CLI/modules/vs_tests.py index e5226eb8c..0b4883902 100644 --- a/tests/CLI/modules/vs_tests.py +++ b/tests/CLI/modules/vs_tests.py @@ -153,7 +153,7 @@ def test_list_vs(self): 'action': None, 'id': 104, 'backend_ip': '10.45.19.35'}]) - + def test_detail_vs(self): result = self.run_command(['vs', 'detail', '100', '--passwords', '--price']) @@ -788,6 +788,7 @@ def test_going_ready(self, _sleep): def test_reload(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'reloadCurrentOperatingSystemConfguration') confirm_mock.return_value = True + mock.return_value = 'true' result = self.run_command(['vs', 'reload', '--postinstall', '100', '--key', '100', '--image', '100', '100']) self.assert_no_fail(result) @@ -796,6 +797,7 @@ def test_reload(self, confirm_mock): def test_reload_no_confirm(self, confirm_mock): mock = self.set_mock('SoftLayer_Virtual_Guest', 'reloadCurrentOperatingSystemConfiguration') confirm_mock.return_value = False + mock.return_value = 'false' result = self.run_command(['vs', 'reload', '--postinstall', '100', '--key', '100', '--image', '100', '100']) self.assertEqual(result.exit_code, 2) From 8f598c1d998a68647e43ded60052fd2c1990495f Mon Sep 17 00:00:00 2001 From: Erick Sapp Date: Tue, 29 May 2018 18:28:11 -0500 Subject: [PATCH 10/10] Fixed lambdas. --- tests/CLI/helper_tests.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/tests/CLI/helper_tests.py b/tests/CLI/helper_tests.py index b79251852..40752afae 100644 --- a/tests/CLI/helper_tests.py +++ b/tests/CLI/helper_tests.py @@ -252,21 +252,15 @@ def test_init(self): class ResolveIdTests(testing.TestCase): def test_resolve_id_one(self): - def resolver(r): - return [12345] - self.assertEqual(helpers.resolve_id(resolver, 'test'), 12345) + self.assertEqual(helpers.resolve_id(lambda r: [12345], 'test'), 12345) def test_resolve_id_none(self): - def resolver(r): - return [] self.assertRaises( - exceptions.CLIAbort, helpers.resolve_id, resolver, 'test') + exceptions.CLIAbort, helpers.resolve_id, lambda r: [], 'test') def test_resolve_id_multiple(self): - def resolver(r): - return [12345, 54321] self.assertRaises( - exceptions.CLIAbort, helpers.resolve_id, resolver, 'test') + exceptions.CLIAbort, helpers.resolve_id, lambda r: [12345, 54321], 'test') class TestTable(testing.TestCase):