From d3e18dbe43fc2a86fd99d1f12bf5d1996b35a3cb Mon Sep 17 00:00:00 2001 From: Rob van der Linde Date: Tue, 7 Nov 2023 17:49:18 +1300 Subject: [PATCH] netcmd: silo member uses consistent output with other commands This also includes always spelling out "authentication silo" or "authentication policy" in full, not just calling it "silo." Signed-off-by: Rob van der Linde Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- python/samba/netcmd/domain/auth/silo_member.py | 8 ++++---- python/samba/tests/samba_tool/domain_auth_silo.py | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/python/samba/netcmd/domain/auth/silo_member.py b/python/samba/netcmd/domain/auth/silo_member.py index 4094ba76840..f9ec2686cf1 100644 --- a/python/samba/netcmd/domain/auth/silo_member.py +++ b/python/samba/netcmd/domain/auth/silo_member.py @@ -67,7 +67,7 @@ class cmd_domain_auth_silo_member_add(Command): # Ensure the user actually exists first. if user is None: - raise CommandError(f"User '{member}' not found.") + raise CommandError(f"User {member} not found.") # Add member. try: @@ -75,7 +75,7 @@ class cmd_domain_auth_silo_member_add(Command): except ModelError as e: raise CommandError(e) - self.outf.write(f"User '{user.name}' added to the {name} silo.\n") + self.outf.write(f"User {user} added to the authentication silo {name}.\n") class cmd_domain_auth_silo_member_list(Command): @@ -166,7 +166,7 @@ class cmd_domain_auth_silo_member_remove(Command): # Ensure the user actually exists first. if user is None: - raise CommandError(f"User '{member}' not found.") + raise CommandError(f"User {member} not found.") # Remove member. try: @@ -174,7 +174,7 @@ class cmd_domain_auth_silo_member_remove(Command): except ModelError as e: raise CommandError(e) - self.outf.write(f"User '{user.name}' removed from the {name} silo.\n") + self.outf.write(f"User {user} removed from the authentication silo {name}.\n") class cmd_domain_auth_silo_member(SuperCommand): diff --git a/python/samba/tests/samba_tool/domain_auth_silo.py b/python/samba/tests/samba_tool/domain_auth_silo.py index c440e0eeff5..27c5caf6a33 100644 --- a/python/samba/tests/samba_tool/domain_auth_silo.py +++ b/python/samba/tests/samba_tool/domain_auth_silo.py @@ -527,7 +527,8 @@ class AuthSiloMemberCmdTestCase(BaseAuthCmdTest): "--name", silo, "--member", member) self.assertIsNone(result, msg=err) - self.assertIn(f"User '{member}' added to the {silo} silo.", out) + self.assertIn( + f"User {member} added to the authentication silo {silo}", out) self.addCleanup(self.remove_silo_member, silo, member) def remove_silo_member(self, silo, member): @@ -601,7 +602,8 @@ class AuthSiloMemberCmdTestCase(BaseAuthCmdTest): "--member", computer) self.assertIsNone(result, msg=err) - self.assertIn(f"User '{name}' added to the {silo} silo.", out) + self.assertIn( + f"User {name} added to the authentication silo {silo}.", out) def test_member_add__unknown_user(self): """Test adding an unknown user to an authentication silo.""" @@ -611,4 +613,4 @@ class AuthSiloMemberCmdTestCase(BaseAuthCmdTest): "--member", "does_not_exist") self.assertIsNotNone(result) - self.assertIn("User 'does_not_exist' not found.", err) + self.assertIn("User does_not_exist not found.", err) -- 2.47.3