[fix] User import unit test

src/yunohost/log.py

@@ -32,6 +32,7 @@ import psutil
 
 from datetime import datetime, timedelta
 from logging import FileHandler, getLogger, Formatter
+from io import IOBase
 
 from moulinette import m18n, msettings
 from moulinette.core import MoulinetteError
@@ -374,6 +375,8 @@ def is_unit_operation(
             for field, value in context.items():
                 if isinstance(value, file):
                     context[field] = value.name
+                elif isinstance(value, IOBase):
+                    context[field] = 'IOBase'
             operation_logger = OperationLogger(op_key, related_to, args=context)
 
             try:

src/yunohost/tests/test_user-group.py

@@ -1,6 +1,5 @@
 import pytest
 
-<<<<<<< HEAD
 from .conftest import message, raiseYunohostError
 
 from yunohost.user import (
@@ -27,7 +26,7 @@ maindomain = ""
 
 def clean_user_groups():
     for u in user_list()["users"]:
-        user_delete(u)
+        user_delete(u, purge=True)
 
     for g in user_group_list()["groups"]:
         if g not in ["all_users", "visitors"]: