From 57dcf45a7c838d2fecb633a1f1f2f04929b305ce Mon Sep 17 00:00:00 2001
From: ljf <ljf+git@grimaud.me>
Date: Mon, 21 Dec 2020 03:40:20 +0100
Subject: [PATCH] [fix] User import unit test

---
 src/yunohost/log.py                   | 3 +++
 src/yunohost/tests/test_user-group.py | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/yunohost/log.py b/src/yunohost/log.py
index 9ea2c2024..a8a3281d2 100644
--- a/src/yunohost/log.py
+++ b/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:
diff --git a/src/yunohost/tests/test_user-group.py b/src/yunohost/tests/test_user-group.py
index e83425df9..3252f0ef8 100644
--- a/src/yunohost/tests/test_user-group.py
+++ b/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"]: