From c2972eb22de0107b7f2d2c24bb01bd285d19f5eb Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Thu, 13 Sep 2018 20:00:47 +0000 Subject: [PATCH] Add success test case Most of the test cases ended in an error condition. This adds one that does not. --- oslo_upgradecheck/tests/test_upgradecheck.py | 24 +++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/oslo_upgradecheck/tests/test_upgradecheck.py b/oslo_upgradecheck/tests/test_upgradecheck.py index 7de1c5e..51684fc 100644 --- a/oslo_upgradecheck/tests/test_upgradecheck.py +++ b/oslo_upgradecheck/tests/test_upgradecheck.py @@ -56,6 +56,10 @@ class TestCommands(upgradecheck.UpgradeCommands): ) +class SuccessCommands(TestCommands): + _upgrade_checks = () + + class TestUpgradeCommands(base.BaseTestCase): def test_get_details(self): result = upgradecheck.UpgradeCheckResult( @@ -73,17 +77,21 @@ class TestUpgradeCommands(base.BaseTestCase): class TestMain(base.BaseTestCase): - def test_main(self): + def _run_test(self, func, expected): mock_argv = ['test-status', 'upgrade', 'check'] with mock.patch.object(sys, 'argv', mock_argv, create=True): - inst = TestCommands() - result = upgradecheck.main(inst.check) - self.assertEqual(upgradecheck.UpgradeCheckCode.FAILURE, result) + result = upgradecheck.main(func) + self.assertEqual(expected, result) + + def test_main(self): + inst = TestCommands() + self._run_test(inst.check, upgradecheck.UpgradeCheckCode.FAILURE) def test_main_exception(self): def raises(): raise Exception('test exception') - mock_argv = ['test-status', 'upgrade', 'check'] - with mock.patch.object(sys, 'argv', mock_argv, create=True): - result = upgradecheck.main(raises) - self.assertEqual(255, result) + self._run_test(raises, 255) + + def test_main_success(self): + inst = SuccessCommands() + self._run_test(inst.check, 0)