Unify error messages related to hosts and users

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

cli/koji_cli/commands.py

@@ -233,7 +233,7 @@ def handle_edit_host(options, session, args):
     error_hit = False
     for host, [info] in zip(args, session.multiCall(strict=True)):
         if not info:
-            warn(_("Host %s does not exist") % host)
+            warn(_("No such host: %s") % host)
             error_hit = True
 
     if error_hit:
@@ -1078,7 +1078,7 @@ def handle_disable_host(goptions, session, args):
     error_hit = False
     for host, [id] in zip(args, session.multiCall(strict=True)):
         if not id:
-            print("Host %s does not exist" % host)
+            print("No such host: %s" % host)
             error_hit = True
     if error_hit:
         error("No changes made. Please correct the command line.")
@@ -1107,7 +1107,7 @@ def handle_enable_host(goptions, session, args):
     error_hit = False
     for host, [id] in zip(args, session.multiCall(strict=True)):
         if not id:
-            print("Host %s does not exist" % host)
+            print("No such host: %s" % host)
             error_hit = True
     if error_hit:
         error("No changes made. Please correct the command line.")
@@ -2004,7 +2004,7 @@ def handle_list_permissions(goptions, session, args):
     if options.user:
         user = session.getUser(options.user)
         if not user:
-            error("User %s does not exist" % options.user)
+            error("No such user: %s" % options.user)
         perms = session.getUserPerms(user['id'])
     elif options.mine:
         perms = session.getPerms()
@@ -4035,7 +4035,7 @@ def handle_edit_target(goptions, session, args):
         targetInfo['build_tag_name'] = options.build_tag
         chkbuildtag = session.getTag(options.build_tag)
         if not chkbuildtag:
-            error("Build tag does not exist: %s" % options.build_tag)
+            error("No such tag: %s" % options.build_tag)
         if not chkbuildtag.get("arches", None):
             error("Build tag has no arches: %s" % options.build_tag)
     if options.dest_tag:

tests/test_cli/test_disable_host.py

@@ -68,7 +68,7 @@ class TestDisableHost(utils.CliTestCase):
         session.editHost.assert_not_called()
         expect = ''
         for host in arguments:
-            expect += "Host %s does not exist\n" % host
+            expect += "No such host: %s\n" % host
         self.assert_console_message(stdout, expect)
         self.assert_console_message(stderr, "No changes made. Please correct the command line.\n")
 

tests/test_cli/test_edit_host.py

@@ -203,9 +203,9 @@ class TestEditHost(utils.CliTestCase):
             handle_edit_host(options, session, args)
         self.assertExitCode(ex, 1)
         actual = stderr.getvalue()
-        expected = """Host host does not exist
+        expected = """No such host: %s
 No changes made, please correct the command line
-"""
+""" % host
         self.assertMultiLineEqual(actual, expected)
         # Finally, assert that things were called as we expected.
         activate_session_mock.assert_called_once_with(session, options)

tests/test_cli/test_enable_host.py

@@ -67,7 +67,7 @@ class TestEnableHost(utils.CliTestCase):
         session.editHost.assert_not_called()
         expect = ''
         for host in arguments:
-            expect += "Host %s does not exist\n" % host
+            expect += "No such host: %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)

tests/test_cli/test_list_permissions.py

@@ -51,7 +51,7 @@ class TestListPermissions(utils.CliTestCase):
             activate_session=None)
 
         # case 2. user does not exists
-        expected = "User %s does not exist" % user + "\n"
+        expected = "No such user: %s" % user + "\n"
         session.getUser.return_value = None
         with self.assertRaises(SystemExit) as ex:
             handle_list_permissions(options, session, ['--user', user])