#233: guid needs to be equal if copied from lda or with doveadm

ceph-dovecot · Jan 22, 2019 · 6aaf516 · 6aaf516
1 parent bd0023d
commit 6aaf516
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/tests/storage-rbox/it_test_doveadm_backup_rbox.cpp b/src/tests/storage-rbox/it_test_doveadm_backup_rbox.cpp
@@ -160,11 +160,10 @@ TEST_F(StorageTest, mail_doveadm_backup_copy_mail_in_inbox) {
   mail2->get_metadata(librmb::RBOX_METADATA_FROM_ENVELOPE, &val2);
   ASSERT_STREQ(val, val2);
   val = val2 = NULL;
-  // TODO: i assume if, mail was copied the guid of the copy differs from the original mail.
-  // However this asumption needs clarification!
+
   mail1->get_metadata(librmb::RBOX_METADATA_GUID, &val);
   mail2->get_metadata(librmb::RBOX_METADATA_GUID, &val2);
-  ASSERT_STRNE(val, val2);
+  ASSERT_STREQ(val, val2);
 
   val = val2 = NULL;
   mail1->get_metadata(librmb::RBOX_METADATA_MAILBOX_GUID, &val);

diff --git a/src/tests/storage-rbox/it_test_lda_rbox.cpp b/src/tests/storage-rbox/it_test_lda_rbox.cpp
@@ -168,11 +168,9 @@ TEST_F(StorageTest, mail_lda_copy_mail_in_inbox) {
   ASSERT_STREQ(val, val2);
   val = val2 = NULL;
 
-  // TODO: i assume if, mail was copied the guid of the copy differs from the original mail.
-  // However this assumption needs clarification!
   mail1->get_metadata(librmb::RBOX_METADATA_GUID, &val);
   mail2->get_metadata(librmb::RBOX_METADATA_GUID, &val2);
-  ASSERT_STRNE(val, val2);
+  ASSERT_STREQ(val, val2);
 
   val = val2 = NULL;
   mail1->get_metadata(librmb::RBOX_METADATA_MAILBOX_GUID, &val);