e3/bcee69f70161e4da9f03f62c81b39d31447cd4

   1 Return-Path: <aclements@csail.mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 1B17B431FD4\r
   6         for <notmuch@notmuchmail.org>; Thu, 23 Oct 2014 05:31:29 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -2.3\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id qO6t+kRkwWEb for <notmuch@notmuchmail.org>;\r
  16         Thu, 23 Oct 2014 05:31:20 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-8.mit.edu (dmz-mailsec-scanner-8.mit.edu\r
  18         [18.7.68.37])\r
  19         (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 48FD6429E26\r
  22         for <notmuch@notmuchmail.org>; Thu, 23 Oct 2014 05:30:58 -0700 (PDT)\r
  23 X-AuditID: 12074425-f79e46d000002583-a5-5448f501dd64\r
  24 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  25         (using TLS with cipher AES256-SHA (256/256 bits))\r
  26         (Client did not present a certificate)\r
  27         by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
  28         id BD.F4.09603.105F8445; Thu, 23 Oct 2014 08:30:57 -0400 (EDT)\r
  29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  30         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id s9NCUtbY030367; \r
  31         Thu, 23 Oct 2014 08:30:55 -0400\r
  32 Received: from drake.dyndns.org\r
  33         (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  34         [216.15.114.40]) (authenticated bits=0)\r
  35         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  36         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s9NCUsKU008986\r
  37         (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT);\r
  38         Thu, 23 Oct 2014 08:30:54 -0400\r
  39 Received: from amthrax by drake.dyndns.org with local (Exim 4.84)\r
  40         (envelope-from <aclements@csail.mit.edu>)\r
  41         id 1XhHXU-0007c8-Ff; Thu, 23 Oct 2014 08:30:48 -0400\r
  42 From: Austin Clements <aclements@csail.mit.edu>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH v3 8/9] test: Test upgrade to ghost messages feature\r
  45 Date: Thu, 23 Oct 2014 08:30:40 -0400\r
  46 Message-Id: <1414067441-29054-9-git-send-email-aclements@csail.mit.edu>\r
  47 X-Mailer: git-send-email 2.1.0\r
  48 In-Reply-To: <1414067441-29054-1-git-send-email-aclements@csail.mit.edu>\r
  49 References: <1414067441-29054-1-git-send-email-aclements@csail.mit.edu>\r
  50 X-Brightmail-Tracker:\r
  51  H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsUixCmqrMv41SPE4NkCdYvVc3ksrt+cyezA\r
  52         5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZRz+d4m94BhXRXdHK3MD43uOLkZODgkBE4kr\r
  53         O14yQ9hiEhfurWfrYuTiEBKYzSSxcfF5RghnI6PEqqVT2SGcO0wSt+88ZIVwljBK7J/7Bqyf\r
  54         TUBfYsXaSawgtoiAtMTOu7PBbGYBD4kpra/AbGEBF4kzD7awgNgsAqoSZz++BbN5Bdwlvuz9\r
  55         xwRxh5zEht3/GUFsTqDePTvusIHYQkA1258fZJ3AyL+AkWEVo2xKbpVubmJmTnFqsm5xcmJe\r
  56         XmqRroVebmaJXmpK6SZGUCixu6juYJxwSOkQowAHoxIP74VUjxAh1sSy4srcQ4ySHExKorwx\r
  57         D4BCfEn5KZUZicUZ8UWlOanFhxglOJiVRHjjLwDleFMSK6tSi/JhUtIcLErivJt+8IUICaQn\r
  58         lqRmp6YWpBbBZGU4OJQkeBm/ADUKFqWmp1akZeaUIKSZODhBhvMADb/1GWR4cUFibnFmOkT+\r
  59         FKOilDhvMkhCACSRUZoH1wuL9VeM4kCvCPOqgazgAaYJuO5XQIOZQK7eADa4JBEhJdXAmGaz\r
  60         qP/E3edha5KzzIWEr195dOqvTnzxQVO1urSPljcnf1NVMuetlPc6e++DvInBwvJlNTY3OZ+Z\r
  61         cIW/7MzwnLL1UdaLzlfrtoatffBoS0vXjs6SJ9PdFuxiY/jN2CK10MpaVTry+UGbT3q7604o\r
  62         hlhNXnjEe4qO7SWr+Z7CDz6YfcuTStXYosRSnJFoqMVcVJwIAFJdcx7QAgAA\r
  63 Cc: Austin Clements <aclements@csail.mit.edu>\r
  64 X-BeenThere: notmuch@notmuchmail.org\r
  65 X-Mailman-Version: 2.1.13\r
  66 Precedence: list\r
  67 List-Id: "Use and development of the notmuch mail system."\r
  68         <notmuch.notmuchmail.org>\r
  69 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  71 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  72 List-Post: <mailto:notmuch@notmuchmail.org>\r
  73 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  74 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  75         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  76 X-List-Received-Date: Thu, 23 Oct 2014 12:31:29 -0000\r
  77 \r
  78 ---\r
  79  test/T530-upgrade.sh | 21 +++++++++++++++++++++\r
  80  1 file changed, 21 insertions(+)\r
  81 \r
  82 diff --git a/test/T530-upgrade.sh b/test/T530-upgrade.sh\r
  83 index c4c4ac8..6b42a69 100755\r
  84 --- a/test/T530-upgrade.sh\r
  85 +++ b/test/T530-upgrade.sh\r
  86 @@ -116,4 +116,25 @@ MAIL_DIR/bar/new/21:2,\r
  87  MAIL_DIR/bar/new/22:2,\r
  88  MAIL_DIR/cur/51:2,"\r
  89  \r
  90 +# Ghost messages are difficult to test since they're nearly invisible.\r
  91 +# However, if the upgrade works correctly, the ghost message should\r
  92 +# retain the right thread ID even if all of the original messages in\r
  93 +# the thread are deleted.  That's what we test.  This won't detect if\r
  94 +# the upgrade just plain didn't happen, but it should detect if\r
  95 +# something went wrong.\r
  96 +test_begin_subtest "ghost message retains thread ID"\r
  97 +# Upgrade database\r
  98 +notmuch new\r
  99 +# Get thread ID of real message\r
 100 +thread=$(notmuch search --output=threads id:4EFC743A.3060609@april.org)\r
 101 +# Delete all real messages in that thread\r
 102 +rm $(notmuch search --output=files $thread)\r
 103 +notmuch new\r
 104 +# "Deliver" ghost message\r
 105 +add_message '[subject]=Ghost' '[id]=4EFC3931.6030007@april.org'\r
 106 +# If the ghost upgrade worked, the new message should be attached to\r
 107 +# the existing thread ID.\r
 108 +nthread=$(notmuch search --output=threads id:4EFC3931.6030007@april.org)\r
 109 +test_expect_equal "$thread" "$nthread"\r
 110 +\r
 111  test_done\r
 112 -- \r
 113 2.1.0\r
 114 \r