Add and upfate CLI unit tests

Fixes: https://pagure.io/koji/issue/729

tests/test_cli/test_cancel.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 
 import mock
-from six.moves import StringIO
 
 import koji
 from koji_cli.commands import handle_cancel
@@ -9,13 +8,14 @@ from . import utils
 
 
 class TestCancel(utils.CliTestCase):
-    maxDiff = None
 
     def setUp(self):
+        self.maxDiff = None
         self.options = mock.MagicMock()
         self.options.quiet = False
         self.session = mock.MagicMock()
         self.session.multicall.return_value.__enter__.return_value = self.session
+        self.activate_session_mock = mock.patch('koji_cli.commands.activate_session').start()
 
         self.error_format = """Usage: %s cancel [options] <task_id|build> [<task_id|build> ...]
 (Specify the --help global option for a list of other help options)
@@ -23,27 +23,25 @@ class TestCancel(utils.CliTestCase):
 %s: error: {message}
 """ % (self.progname, self.progname)
 
-    @mock.patch('koji_cli.commands.activate_session')
-    def test_anon_cancel(self, activate_session_mock):
+    def test_anon_cancel(self):
         args = ['123']
-        activate_session_mock.side_effect = koji.GenericError
+        self.activate_session_mock.side_effect = koji.GenericError
 
         with self.assertRaises(koji.GenericError):
             handle_cancel(self.options, self.session, args)
 
-        activate_session_mock.assert_called_once_with(self.session, self.options)
+        self.activate_session_mock.assert_called_once_with(self.session, self.options)
         self.session.cancelTask.assert_not_called()
         self.session.cancelTaskFull.assert_not_called()
         self.session.cancelBuild.assert_not_called()
 
-    @mock.patch('koji_cli.commands.activate_session')
-    def test_cancel_tasks(self, activate_session_mock):
+    def test_cancel_tasks(self):
         # integers are always treated like task IDs, not build IDs
         args = ['123', '234']
 
         handle_cancel(self.options, self.session, args)
 
-        activate_session_mock.assert_called_once_with(self.session, self.options)
+        self.activate_session_mock.assert_called_once_with(self.session, self.options)
         self.session.cancelTask.assert_has_calls([mock.call(123), mock.call(234)])
         self.session.cancelTaskFull.assert_not_called()
         self.session.cancelBuild.assert_not_called()
@@ -54,9 +52,7 @@ class TestCancel(utils.CliTestCase):
             "please specify only task ids (integer) or builds (n-v-r)")
         self.assert_system_exit(
             handle_cancel,
-            self.options,
-            self.session,
-            args,
+            self.options, self.session, args,
             stdout='',
             stderr=expected)
 
@@ -64,72 +60,66 @@ class TestCancel(utils.CliTestCase):
         self.session.cancelTaskFull.assert_not_called()
         self.session.cancelBuild.assert_not_called()
 
-    @mock.patch('koji_cli.commands.activate_session')
-    def test_cancel_builds(self, activate_session_mock):
+    def test_cancel_builds(self):
         args = ['name-version-release']
 
         handle_cancel(self.options, self.session, args)
 
-        activate_session_mock.assert_called_once_with(self.session, self.options)
+        self.activate_session_mock.assert_called_once_with(self.session, self.options)
         self.session.cancelTask.assert_not_called()
         self.session.cancelTaskFull.assert_not_called()
         self.session.cancelBuild.assert_called_once_with(args[0])
 
-    @mock.patch('koji_cli.commands.activate_session')
-    def test_cancel_builds_unused_options(self, activate_session_mock):
+    def test_cancel_builds_unused_options(self):
         # it is good for nothing here
         args = ['name-version-release', '--full', '--justone', '--force']
         handle_cancel(self.options, self.session, args)
 
-        activate_session_mock.assert_called_once_with(self.session, self.options)
+        self.activate_session_mock.assert_called_once_with(self.session, self.options)
         self.session.cancelTask.assert_not_called()
         self.session.cancelTaskFull.assert_not_called()
         self.session.cancelBuild.assert_called_once_with(args[0])
 
-    @mock.patch('koji_cli.commands.activate_session')
-    def test_cancel_tasks_full(self, activate_session_mock):
+    def test_cancel_tasks_full(self):
         args = ['123', '--full']
 
         handle_cancel(self.options, self.session, args)
 
-        activate_session_mock.assert_called_once_with(self.session, self.options)
+        self.activate_session_mock.assert_called_once_with(self.session, self.options)
         self.session.cancelTask.assert_not_called()
         self.session.cancelTaskFull.assert_called_once_with(123)
         self.session.cancelBuild.assert_not_called()
 
-    @mock.patch('koji_cli.commands.activate_session')
-    def test_cancel_tasks_justone(self, activate_session_mock):
+    def test_cancel_tasks_justone(self):
         args = ['123', '--justone']
 
         handle_cancel(self.options, self.session, args)
 
-        activate_session_mock.assert_called_once_with(self.session, self.options)
+        self.activate_session_mock.assert_called_once_with(self.session, self.options)
         self.session.cancelTask.assert_called_once_with(123, recurse=False)
         self.session.cancelTaskFull.assert_not_called()
         self.session.cancelBuild.assert_not_called()
 
-    @mock.patch('koji_cli.commands.activate_session')
-    def test_cancel_tasks_force(self, activate_session_mock):
+    def test_cancel_tasks_force(self):
         args = ['123', '--force', '--full']
 
         handle_cancel(self.options, self.session, args)
 
-        activate_session_mock.assert_called_once_with(self.session, self.options)
+        self.activate_session_mock.assert_called_once_with(self.session, self.options)
         self.session.cancelTaskFull.assert_called_once_with(123, strict=False)
         self.session.cancelBuild.assert_not_called()
 
-    @mock.patch('sys.stderr', new_callable=StringIO)
-    def test_cancel_without_arguments(self, stderr):
-        expected = """Usage: %s cancel [options] <task_id|build> [<task_id|build> ...]
-(Specify the --help global option for a list of other help options)
-
-%s: error: You must specify at least one task id or build
-""" % (self.progname, self.progname)
-        with self.assertRaises(SystemExit) as ex:
-            handle_cancel(self.options, self.session, [])
-        self.assertExitCode(ex, 2)
-        self.assert_console_message(stderr, expected)
+    def test_cancel_without_arguments(self):
+        arguments = []
+        self.assert_system_exit(
+            handle_cancel,
+            self.options, self.session, arguments,
+            stderr=self.format_error_message("You must specify at least one task id or build"),
+            stdout='',
+            activate_session=None,
+            exit_code=2)
 
+        self.activate_session_mock.assert_not_called()
         self.session.cancelTask.assert_not_called()
         self.session.cancelTaskFull.assert_not_called()
         self.session.cancelBuild.assert_not_called()