From 1507128fcca36093ea9f544e8a44adca5d514605 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Wed, 1 Jul 2020 21:26:23 +0200
Subject: pullimap: Also compare RFC 5322 date and envelope information in
 mailbox comparison tests.

---
 Changelog        |  7 +++++++
 tests/pullimap/t | 10 ++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Changelog b/Changelog
index 70eea4e..4207069 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,10 @@
+interimap (0.5.1) UNRELEASED;
+
+ + pullimap: also compare RFC 5322 date and envelope information in
+   mailbox comparison tests.
+
+ -- Guilhem Moulin <guilhem@fripost.org>  Wed, 01 Jul 2020 21:24:50 +0200
+
 interimap (0.5) upstream;
 
  Breaking changes:
diff --git a/tests/pullimap/t b/tests/pullimap/t
index 115432d..0dfe634 100644
--- a/tests/pullimap/t
+++ b/tests/pullimap/t
@@ -6,15 +6,13 @@ step_start "\`pullimap --idle\` refuses to create the state file"
 ! pullimap --idle "remote" || error
 step_done
 
-# compare mailboxes; can't compare the RFC 3501 TEXT as LMTP adds a
-# Received: header.
-# TODO unset lmtp_add_received_header once available in sid:
-# https://doc.dovecot.org/settings/dovecot_core_settings/#lmtp-add-received-header
+# compare mailboxes (can't compare the RFC 3501 TEXT as the LMTPd inconditionally
+# adds a Return-Path: header -- and also Delivered-To: and Received: to by default)
 list_mails_sha256() {
     local u="$1" guid uid
+    local fields="body date.sent imap.bodystructure imap.envelope"
     while read guid uid; do
-        doveadm -u "$u" -f "flow" fetch body mailbox-guid "$guid" uid "$uid" \
-            | sed "1s/body=//" | sha256sum
+        doveadm -u "$u" -f "flow" fetch "$fields" mailbox-guid "$guid" uid "$uid" | sha256sum
     done < <(doveadm -u "$u" search mailbox "$MAILBOX") | sort -f
 }
 check() {
-- 
cgit v1.2.3