diff --git a/cli/koji_cli/commands.py b/cli/koji_cli/commands.py index 59ad01be..620c12b6 100644 --- a/cli/koji_cli/commands.py +++ b/cli/koji_cli/commands.py @@ -336,6 +336,7 @@ def handle_remove_channel(goptions, session, args): parser = OptionParser(usage=get_usage_str(usage)) parser.add_option("--force", action="store_true", help="force removal, if possible") (options, args) = parser.parse_args(args) + print("remove-channel is deprecated and will be removed in 1.30") if len(args) != 1: parser.error("Incorrect number of arguments") activate_session(session, goptions) diff --git a/hub/kojihub.py b/hub/kojihub.py index f8825208..29174333 100644 --- a/hub/kojihub.py +++ b/hub/kojihub.py @@ -2410,6 +2410,7 @@ def remove_channel(channel_name, force=False): Removing channel will remove also remove complete history for that channel. """ + logger.warning("removeChannel call is deprecated and will be removed in 1.30") context.session.assertPerm('admin') channel_id = get_channel_id(channel_name, strict=True) # check for task references diff --git a/tests/test_cli/test_remove_channel.py b/tests/test_cli/test_remove_channel.py index d92fdde6..785cdc27 100644 --- a/tests/test_cli/test_remove_channel.py +++ b/tests/test_cli/test_remove_channel.py @@ -29,7 +29,7 @@ class TestRemoveChannel(utils.CliTestCase): self.session.getChannel.return_value = self.channel_info rv = handle_remove_channel(self.options, self.session, [self.channel_name]) actual = stdout.getvalue() - expected = '' + expected = 'remove-channel is deprecated and will be removed in 1.30\n' self.assertMultiLineEqual(actual, expected) activate_session_mock.assert_called_once_with(self.session, self.options) self.session.getChannel.assert_called_once_with(self.channel_name) @@ -42,7 +42,7 @@ class TestRemoveChannel(utils.CliTestCase): self.session.getChannel.return_value = self.channel_info rv = handle_remove_channel(self.options, self.session, ['--force', self.channel_name]) actual = stdout.getvalue() - expected = '' + expected = 'remove-channel is deprecated and will be removed in 1.30\n' self.assertMultiLineEqual(actual, expected) activate_session_mock.assert_called_once_with(self.session, self.options) self.session.getChannel.assert_called_once_with(self.channel_name) @@ -76,7 +76,7 @@ class TestRemoveChannel(utils.CliTestCase): self.assertExitCode(ex, 2) actual_stdout = stdout.getvalue() actual_stderr = stderr.getvalue() - expected_stdout = '' + expected_stdout = 'remove-channel is deprecated and will be removed in 1.30\n' expected_stderr = """Usage: %s remove-channel [options] (Specify the --help global option for a list of other help options)