#3535 CLI edit-channel set default value for None and error msg to stderr.
Merged 2 years ago by tkopecek. Opened 2 years ago by jcupova.
jcupova/koji issue-3534  into  master

file modified
+2 -1
@@ -348,6 +348,7 @@ 

      cinfo = session.getChannel(args[0])

      if not cinfo:

          error("No such channel: %s" % args[0])

+     result = None

      try:

          result = session.editChannel(args[0], **vals)

      except koji.GenericError as ex:
@@ -357,7 +358,7 @@ 

              error("editChannel is available on hub from Koji 1.26 version, your version is %s" %

                    version)

          else:

-             print(msg)

+             warn(msg)

      if not result:

          error("No changes made, please correct the command line")

  

@@ -133,6 +133,29 @@ 

          self.session.getChannel.assert_called_once_with(self.channel_old)

          self.session.getKojiVersion.assert_not_called()

  

+     def test_handle_edit_channel_other_error_message(self):

+         expected_api = "Other error message"

+         expected = """Other error message

+ No changes made, please correct the command line

+ """

+ 

+         self.session.editChannel.side_effect = koji.GenericError(expected_api)

+         self.assert_system_exit(

+             handle_edit_channel,

+             self.options,

+             self.session,

+             [self.channel_old, '--name', self.channel_new, '--description', self.description],

+             stderr=expected,

+             stdout='',

+             activate_session=None,

+             exit_code=1

+         )

+         self.session.editChannel.assert_called_once_with(self.channel_old, name=self.channel_new,

+                                                          description=self.description)

+         self.activate_session_mock.assert_called_once_with(self.session, self.options)

+         self.session.getChannel.assert_called_once_with(self.channel_old)

+         self.session.getKojiVersion.assert_not_called()

+ 

  

  if __name__ == '__main__':

      unittest.main()

Metadata Update from @tkopecek:
- Pull-request tagged with: testing-ready

2 years ago

Metadata Update from @mfilip:
- Pull-request tagged with: testing-done

2 years ago

Commit 79d3750 fixes this pull-request

Pull-Request has been merged by tkopecek

2 years ago