diff --git a/modoboa/core/tests/test_views.py b/modoboa/core/tests/test_views.py index d2d5572ef..da9d7199a 100644 --- a/modoboa/core/tests/test_views.py +++ b/modoboa/core/tests/test_views.py @@ -109,6 +109,9 @@ SETTINGS_SAMPLE = { "pdfcredentials-imap_server_port": 667, "pdfcredentials-imap_connection_security": "starttls", "dmarc-enable_rlookups": False, + "imap_migration-enabled_imapmigration": True, + "imap_migration-max_sync_accounts": 2, + "imap_migration-create_folders": True, } diff --git a/modoboa/imap_migration/api/v1/serializers.py b/modoboa/imap_migration/api/v1/serializers.py index d890c88bb..2a95b9802 100644 --- a/modoboa/imap_migration/api/v1/serializers.py +++ b/modoboa/imap_migration/api/v1/serializers.py @@ -74,18 +74,18 @@ class EmailProviderSerializer(serializers.ModelSerializer): return instance -class MailboxSerializer(serializers.ModelSerializer): +class MailboxMigrationSerializer(serializers.ModelSerializer): """Simple mailbox serializer.""" class Meta: - fields = ("id", "full_address", "user") + fields = ("id", "address", "user") model = admin_models.Mailbox class MigrationSerializer(serializers.ModelSerializer): """Serializer class for Migration.""" - mailbox = MailboxSerializer() + mailbox = MailboxMigrationSerializer() class Meta: depth = 1 diff --git a/modoboa/imap_migration/api/v2/viewsets.py b/modoboa/imap_migration/api/v2/viewsets.py index 0aaacdc1e..a1fa254b4 100644 --- a/modoboa/imap_migration/api/v2/viewsets.py +++ b/modoboa/imap_migration/api/v2/viewsets.py @@ -24,14 +24,10 @@ class EmailProviderViewSet(v1_viewsets.EmailProviderViewSet): port = serializer.data["port"] try: if secured: - print(address) - print(port) imaplib.IMAP4_SSL(address, port) else: imaplib.IMAP4(address, port) except (socket.error, imaplib.IMAP4.error, ssl.SSLError) as error: - print(type(error)) - print(error) return response.Response({'status': 'failed'}, 400) return response.Response(status=200)