Increase CLI test cases

tests/test_cli/test_disable_channel.py

@@ -15,6 +15,10 @@ class TestDisableChannel(utils.CliTestCase):
     maxDiff = None
 
     def setUp(self):
+        self.options = mock.MagicMock()
+        self.options.quiet = False
+        self.session = mock.MagicMock()
+        self.activate_session_mock = mock.patch('koji_cli.commands.activate_session').start()
         self.error_format = """Usage: %s disable-channel [options] <channelname> [<channelname> ...]
 (Specify the --help global option for a list of other help options)
 
@@ -33,70 +37,62 @@ class TestDisableChannel(utils.CliTestCase):
             m._result = (result,)
         return m
 
-    @mock.patch('sys.stderr', new_callable=six.StringIO)
-    @mock.patch('sys.stdout', new_callable=six.StringIO)
-    @mock.patch('koji_cli.commands.activate_session')
-    def test_handle_disable_channel(self, activate_session_mock, stdout, stderr):
+    def test_handle_disable_channel_no_such_channel(self):
         """Test disable-channel function"""
-        options = mock.MagicMock()
-        session = mock.MagicMock()
-
-        mcall = session.multicall.return_value.__enter__.return_value
-
+        mcall = self.session.multicall.return_value.__enter__.return_value
         mcall.getChannel.return_value = self.__vm(None)
 
         arguments = ['test-channel']
-        with self.assertRaises(SystemExit) as ex:
-            handle_disable_channel(options, session, arguments)
-        self.assertExitCode(ex, 1)
-        activate_session_mock.assert_called_once()
-        session.multicall.assert_called_once()
-        session.disableChannel.assert_not_called()
         expect = ''
         for host in arguments:
             expect += "No such channel: %s\n" % host
         stderr_exp = "No changes made. Please correct the command line.\n"
-        self.assert_console_message(stdout, expect)
-        self.assert_console_message(stderr, stderr_exp)
+        self.assert_system_exit(
+            handle_disable_channel,
+            self.options, self.session, arguments,
+            stdout=expect,
+            stderr=stderr_exp,
+            activate_session=None,
+            exit_code=1
+        )
+        self.activate_session_mock.assert_called_once()
+        self.session.multicall.assert_called_once()
+        self.session.disableChannel.assert_not_called()
 
-        # reset session mocks
-        activate_session_mock.reset_mock()
-        session.disableChannel.reset_mock()
-        session.multicall.reset_mock()
-        mcall = session.multicall.return_value.__enter__.return_value
+    @mock.patch('sys.stdout', new_callable=six.StringIO)
+    def test_handle_disable_channel_valid(self, stdout):
+        """Test disable-channel function"""
+        mcall = self.session.multicall.return_value.__enter__.return_value
 
         mcall.getChannel.return_value = self.__vm(self.channelinfo)
 
         arguments = ['test-channel', '--comment', 'enable channel test']
-        handle_disable_channel(options, session, arguments)
-        activate_session_mock.assert_called_once()
-        self.assertEqual(2, session.multicall.call_count)
+        handle_disable_channel(self.options, self.session, arguments)
+        self.activate_session_mock.assert_called_once()
+        self.assertEqual(2, self.session.multicall.call_count)
         self.assert_console_message(stdout, '')
 
-    @mock.patch('sys.stdout', new_callable=six.StringIO)
-    @mock.patch('koji_cli.commands.activate_session')
-    def test_handle_disable_host_no_argument(self, activate_session_mock, stdout):
+    def test_handle_disable_host_no_argument(self):
         """Test disable-channel function without arguments"""
-        options = mock.MagicMock()
-        session = mock.MagicMock()
-
-        session.getChannel.return_value = None
-        session.multicall.return_value = [[None]]
-        session.disableChannel.return_value = True
+        self.session.getChannel.return_value = None
+        self.session.multicall.return_value = [[None]]
+        self.session.disableChannel.return_value = True
 
         expected = self.format_error_message("At least one channel must be specified")
         self.assert_system_exit(
             handle_disable_channel,
-            options,
-            session,
+            self.options,
+            self.session,
             [],
             stderr=expected,
-            activate_session=None)
+            activate_session=None,
+            exit_code=2
+        )
 
-        activate_session_mock.assert_not_called()
-        session.getChannel.assert_not_called()
-        session.multicall.assert_not_called()
-        session.disableChannel.assert_not_called()
+        self.activate_session_mock.assert_not_called()
+        self.session.getChannel.assert_not_called()
+        self.session.multicall.assert_not_called()
+        self.session.disableChannel.assert_not_called()
 
     def test_handle_disable_channel_help(self):
         """Test disable-channel help message"""