From 5b978e4475bfbff29ac7c2ed998018e91792687f Mon Sep 17 00:00:00 2001 From: Spitfireap Date: Mon, 22 Jul 2024 15:04:14 +0200 Subject: [PATCH] Fixed tests --- modoboa/sievefilters/api/v2/tests.py | 5 +++-- modoboa/sievefilters/lib.py | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modoboa/sievefilters/api/v2/tests.py b/modoboa/sievefilters/api/v2/tests.py index 18b7a781c..3c95743b4 100644 --- a/modoboa/sievefilters/api/v2/tests.py +++ b/modoboa/sievefilters/api/v2/tests.py @@ -1,9 +1,10 @@ """API v2 tests.""" from unittest import mock -from datetime import timezone, timedelta +from datetime import timedelta from django.urls import reverse +from django.utils import timezone from oauth2_provider.models import get_access_token_model, get_application_model @@ -33,7 +34,7 @@ class FilterSetViewSetTestCase(ModoAPITestCase): ) cls.access_token = AccessToken.objects.create( - user=cls.test_user, + user=cls.user, scope="read write", expires=timezone.now() + timedelta(seconds=300), token="secret-access-token-key", diff --git a/modoboa/sievefilters/lib.py b/modoboa/sievefilters/lib.py index e0617a635..481b17b8f 100644 --- a/modoboa/sievefilters/lib.py +++ b/modoboa/sievefilters/lib.py @@ -24,10 +24,10 @@ class SieveClient: msc: managesieve.Client - def __init__(self, user: Optional[str] = None, oauth_token: Optional[str] = None): - if user and oauth_token: + def __init__(self, user: Optional[str] = None, password: Optional[str] = None): + if user and password: try: - ret, msg = self.login(user, oauth_token) + ret, msg = self.login(user, password) except (managesieve.Error, ConnectionError) as e: raise SieveClientError(str(e)) if not ret: