From 3732349bc23fbe1b9ab3b3f8d65319ab20ef8114 Mon Sep 17 00:00:00 2001
From: Florence Blanc-Renaud <flo@redhat.com>
Date: Jun 22 2022 18:53:29 +0000
Subject: xmlrpc tests: updated expected output for preserved user


Update the expected summary for the command
ipa user-del --preserve

The command now displays: Preserved user: user1
instead of                Deleted user: user1

Related: https://pagure.io/freeipa/issue/9187

Signed-off-by: Florence Blanc-Renaud <flo@redhat.com>
Reviewed-By: Michal Polovka <mpolovka@redhat.com>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>

---

diff --git a/ipatests/test_xmlrpc/test_stageuser_plugin.py b/ipatests/test_xmlrpc/test_stageuser_plugin.py
index bc606b0..fd14687 100644
--- a/ipatests/test_xmlrpc/test_stageuser_plugin.py
+++ b/ipatests/test_xmlrpc/test_stageuser_plugin.py
@@ -479,11 +479,12 @@ class TestActive(XMLRPC_test):
 
     def test_delete_preserve(self, user):
         user.ensure_exists()
-        user.track_delete()
+        user.track_delete(preserve=True)
         command = user.make_delete_command(no_preserve=False, preserve=True)
         result = command()
         user.check_delete(result)
 
+        user.track_delete(preserve=False)
         command = user.make_delete_command()
         result = command()
         user.check_delete(result)
@@ -622,6 +623,7 @@ class TestCustomAttr(XMLRPC_test):
         assert 'BusinessCat' in result['result'][u'businesscategory']
 
         # delete the user with --preserve
+        user_customattr.track_delete(preserve=True)
         command = user_customattr.make_delete_command(no_preserve=False,
                                                       preserve=True)
         result = command()
@@ -763,6 +765,7 @@ class TestGroups(XMLRPC_test):
         result = command()
         group.check_retrieve(result)
 
+        user.track_delete(preserve=True)
         command = user.make_delete_command(no_preserve=False, preserve=True)
         result = command()
         user.check_delete(result)
diff --git a/ipatests/test_xmlrpc/tracker/user_plugin.py b/ipatests/test_xmlrpc/tracker/user_plugin.py
index 03c1062..b04be4c 100644
--- a/ipatests/test_xmlrpc/tracker/user_plugin.py
+++ b/ipatests/test_xmlrpc/tracker/user_plugin.py
@@ -273,9 +273,14 @@ class UserTracker(CertmapdataMixin, KerberosAliasMixin, Tracker):
 
     def check_delete(self, result):
         """ Check 'user-del' command result """
+        if u'preserved' in self.attrs and self.attrs[u'preserved']:
+            summary = u'Preserved user "%s"' % self.uid
+        else:
+            summary = u'Deleted user "%s"' % self.uid
+
         assert_deepequal(dict(
             value=[self.uid],
-            summary=u'Deleted user "%s"' % self.uid,
+            summary=summary,
             result=dict(failed=[]),
             ), result)