54/eacf0afc0b367892f7f552eca814933771a894

   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 181DB431FB6\r
   6         for <notmuch@notmuchmail.org>; Mon,  6 Oct 2014 16:18:06 -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 O8EZD2g24cdn for <notmuch@notmuchmail.org>;\r
  16         Mon,  6 Oct 2014 16:18:02 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-1.mit.edu (dmz-mailsec-scanner-1.mit.edu\r
  18         [18.9.25.12])\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 16EDC431FBC\r
  22         for <notmuch@notmuchmail.org>; Mon,  6 Oct 2014 16:17:37 -0700 (PDT)\r
  23 X-AuditID: 1209190c-f795e6d000006c66-2b-543323104e82\r
  24 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\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-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
  28         id 59.75.27750.01323345; Mon,  6 Oct 2014 19:17:36 -0400 (EDT)\r
  29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  30         by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id s96NHPoT025205; \r
  31         Mon, 6 Oct 2014 19:17:25 -0400\r
  32 Received: from drake.dyndns.org ([12.185.136.2]) (authenticated bits=0)\r
  33         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  34         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s96NHMl4014475\r
  35         (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT);\r
  36         Mon, 6 Oct 2014 19:17:24 -0400\r
  37 Received: from amthrax by drake.dyndns.org with local (Exim 4.84)\r
  38         (envelope-from <aclements@csail.mit.edu>)\r
  39         id 1XbHWs-0001Jz-Bo; Mon, 06 Oct 2014 17:17:22 -0600\r
  40 From: Austin Clements <aclements@csail.mit.edu>\r
  41 To: notmuch@notmuchmail.org\r
  42 Subject: [PATCH v2 11/12] test: Test upgrade to ghost messages feature\r
  43 Date: Mon,  6 Oct 2014 17:17:17 -0600\r
  44 Message-Id: <1412637438-4821-12-git-send-email-aclements@csail.mit.edu>\r
  45 X-Mailer: git-send-email 2.1.0\r
  46 In-Reply-To: <1412637438-4821-1-git-send-email-aclements@csail.mit.edu>\r
  47 References: <1412637438-4821-1-git-send-email-aclements@csail.mit.edu>\r
  48 X-Brightmail-Tracker:\r
  49  H4sIAAAAAAAAA+NgFtrHIsWRmVeSWpSXmKPExsUixG6noiugbBxisHSNgMWN1m5Gi+s3ZzI7\r
  50         MHk8W3WL2WPLoffMAUxRXDYpqTmZZalF+nYJXBmH/11iLzjGVdHd0crcwPieo4uRk0NCwERi\r
  51         y4pFjBC2mMSFe+vZuhi5OIQEZjNJ7Fv/nxHC2cAo8XnyMShnKZPEhc8XWCCcJYwSk+a9YAHp\r
  52         ZxPQl1ixdhIriC0iIC2x8+5sMJtZwEHi7aSnYDuEBdwk7szoB6tnEVCV+NS9hA3E5hVwlzjd\r
  53         NZsN4g45iQ27/4PVcwLF11yZDDZHCKj3+c+nLBMY+RcwMqxilE3JrdLNTczMKU5N1i1OTszL\r
  54         Sy3SNdTLzSzRS00p3cQICiZOSZ4djG8OKh1iFOBgVOLhjdhhGCLEmlhWXJl7iFGSg0lJlHcO\r
  55         u3GIEF9SfkplRmJxRnxRaU5q8SFGCQ5mJRFert9GIUK8KYmVValF+TApaQ4WJXHeTT/4QoQE\r
  56         0hNLUrNTUwtSi2CyMhwcShK8vxWBhgoWpaanVqRl5pQgpJk4OEGG8wAN/wdSw1tckJhbnJkO\r
  57         kT/FqCglzhsMkhAASWSU5sH1wqL9FaM40CvCvOJKQFU8wEQB1/0KaDAT0GDTOfogg0sSEVJS\r
  58         DYzpPrd2NYpMUS/Pn8bIuazcnDueJ1xrvks/05NP/fkWxb2CfY07W/K82abuZm/jdnt02aU0\r
  59         48OvDeYF0V/qIncz3L8csfOPitCZ9+XivsvPvn8ba8Z6eT13xXfl+D9tZqFqrCfqi5ceUc1L\r
  60         fLl79qul/9N/b1p1OXTBD6dmY+m3LcU2l803uSuxFGckGmoxFxUnAgCZRM7e0QIAAA==\r
  61 Cc: Austin Clements <aclements@csail.mit.edu>\r
  62 X-BeenThere: notmuch@notmuchmail.org\r
  63 X-Mailman-Version: 2.1.13\r
  64 Precedence: list\r
  65 List-Id: "Use and development of the notmuch mail system."\r
  66         <notmuch.notmuchmail.org>\r
  67 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  69 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  70 List-Post: <mailto:notmuch@notmuchmail.org>\r
  71 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  72 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  73         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  74 X-List-Received-Date: Mon, 06 Oct 2014 23:18:06 -0000\r
  75 \r
  76 ---\r
  77  test/T530-upgrade.sh | 21 +++++++++++++++++++++\r
  78  1 file changed, 21 insertions(+)\r
  79 \r
  80 diff --git a/test/T530-upgrade.sh b/test/T530-upgrade.sh\r
  81 index c4c4ac8..6b42a69 100755\r
  82 --- a/test/T530-upgrade.sh\r
  83 +++ b/test/T530-upgrade.sh\r
  84 @@ -116,4 +116,25 @@ MAIL_DIR/bar/new/21:2,\r
  85  MAIL_DIR/bar/new/22:2,\r
  86  MAIL_DIR/cur/51:2,"\r
  87  \r
  88 +# Ghost messages are difficult to test since they're nearly invisible.\r
  89 +# However, if the upgrade works correctly, the ghost message should\r
  90 +# retain the right thread ID even if all of the original messages in\r
  91 +# the thread are deleted.  That's what we test.  This won't detect if\r
  92 +# the upgrade just plain didn't happen, but it should detect if\r
  93 +# something went wrong.\r
  94 +test_begin_subtest "ghost message retains thread ID"\r
  95 +# Upgrade database\r
  96 +notmuch new\r
  97 +# Get thread ID of real message\r
  98 +thread=$(notmuch search --output=threads id:4EFC743A.3060609@april.org)\r
  99 +# Delete all real messages in that thread\r
 100 +rm $(notmuch search --output=files $thread)\r
 101 +notmuch new\r
 102 +# "Deliver" ghost message\r
 103 +add_message '[subject]=Ghost' '[id]=4EFC3931.6030007@april.org'\r
 104 +# If the ghost upgrade worked, the new message should be attached to\r
 105 +# the existing thread ID.\r
 106 +nthread=$(notmuch search --output=threads id:4EFC3931.6030007@april.org)\r
 107 +test_expect_equal "$thread" "$nthread"\r
 108 +\r
 109  test_done\r
 110 -- \r
 111 2.1.0\r
 112 \r