e3/5283c6ca970e5237f42dcff2e048c157a84f7a

   1 Return-Path: <jani@nikula.org>\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 723B4431FCB\r
   6         for <notmuch@notmuchmail.org>; Thu,  9 Jan 2014 23:33:58 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
   9 X-Spam-Flag: NO\r
  10 X-Spam-Score: -0.7\r
  11 X-Spam-Level: \r
  12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  13         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id kStYf5CJOvI2 for <notmuch@notmuchmail.org>;\r
  17         Thu,  9 Jan 2014 23:32:08 -0800 (PST)\r
  18 Received: from mail-ee0-f48.google.com (mail-ee0-f48.google.com\r
  19  [74.125.83.48])        (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
  20  certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
  21  5235D431FC3    for <notmuch@notmuchmail.org>; Thu,  9 Jan 2014 23:32:08 -0800\r
  22  (PST)\r
  23 Received: by mail-ee0-f48.google.com with SMTP id t10so27850eei.35\r
  24         for <notmuch@notmuchmail.org>; Thu, 09 Jan 2014 23:32:07 -0800 (PST)\r
  25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  26         d=1e100.net; s=20130820;\r
  27         h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
  28         :references:in-reply-to:references;\r
  29         bh=An4TGZjqieWpkGHUmhKr7HBmewLaYXVs2hRSMJCSZhg=;\r
  30         b=iAUEJWK+6E+lRfWjhSmZFHY0zN1OIB/AQFv7PD93EvGZ5qY7kukmkRZhZ4oOrBw8ky\r
  31         0NE7UNa8Q4h9HttzxuRPyfBxjr6rt1IZZ5QhhwbcRrm8hWX6hhVW06xypwAJBfiCLliP\r
  32         haAYfN+B+sBxmzmcOLWDoBupYtw+72y4ApX1bqWonVgVpRN1aGykDz2jc7SYuCeO3njX\r
  33         ZY3zvn6V9ZxOQsvw+m+P6CqyDrWhQ2xvhSM5pTXSPycVQKnuSkRPuVFFljfjWfiSdHzW\r
  34         byOdohYrSRwc/uJUy7DC4qp3avYavTcjaNkNuaAGj+/cdcgMAjSJ9TY/yCaqnclBdM2B\r
  35         MWGg==\r
  36 X-Gm-Message-State:\r
  37  ALoCoQnjRkxj1/t05ZSci99a4Zi+9wiDl+70UiEOkMkJIyLPyIhulBvLHXaSjgL3kjFW1d3X8UEV\r
  38 X-Received: by 10.14.113.199 with SMTP id a47mr5617114eeh.41.1389305949892;\r
  39         Thu, 09 Jan 2014 14:19:09 -0800 (PST)\r
  40 Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
  41         [88.195.111.91])\r
  42         by mx.google.com with ESMTPSA id 4sm9382887eed.14.2014.01.09.14.19.08\r
  43         for <multiple recipients>\r
  44         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  45         Thu, 09 Jan 2014 14:19:09 -0800 (PST)\r
  46 From: Jani Nikula <jani@nikula.org>\r
  47 To: notmuch@notmuchmail.org\r
  48 Subject: [PATCH 5/5] test: add database upgrade test from format version 1\r
  49 Date: Fri, 10 Jan 2014 00:18:36 +0200\r
  50 Message-Id:\r
  51  <33ae92e21bfeea0e21ad818d011fa4f000aa837c.1389304779.git.jani@nikula.org>\r
  52 X-Mailer: git-send-email 1.8.5.2\r
  53 In-Reply-To: <cover.1389304779.git.jani@nikula.org>\r
  54 References: <cover.1389304779.git.jani@nikula.org>\r
  55 In-Reply-To: <cover.1389304779.git.jani@nikula.org>\r
  56 References: <cover.1389304779.git.jani@nikula.org>\r
  57 X-BeenThere: notmuch@notmuchmail.org\r
  58 X-Mailman-Version: 2.1.13\r
  59 Precedence: list\r
  60 List-Id: "Use and development of the notmuch mail system."\r
  61         <notmuch.notmuchmail.org>\r
  62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  63         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  65 List-Post: <mailto:notmuch@notmuchmail.org>\r
  66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  69 X-List-Received-Date: Fri, 10 Jan 2014 07:33:59 -0000\r
  70 \r
  71 ---\r
  72  test/notmuch-test |  1 +\r
  73  test/upgrade      | 25 +++++++++++++++++++++++++\r
  74  2 files changed, 26 insertions(+)\r
  75  create mode 100755 test/upgrade\r
  76 \r
  77 diff --git a/test/notmuch-test b/test/notmuch-test\r
  78 index d6fdd3a..68c8ad9 100755\r
  79 --- a/test/notmuch-test\r
  80 +++ b/test/notmuch-test\r
  81 @@ -69,6 +69,7 @@ TESTS="\r
  82    parse-time-string\r
  83    search-date\r
  84    thread-replies\r
  85 +  upgrade\r
  86  "\r
  87  TESTS=${NOTMUCH_TESTS:=$TESTS}\r
  88  \r
  89 diff --git a/test/upgrade b/test/upgrade\r
  90 new file mode 100755\r
  91 index 0000000..edee35d\r
  92 --- /dev/null\r
  93 +++ b/test/upgrade\r
  94 @@ -0,0 +1,25 @@\r
  95 +#!/usr/bin/env bash\r
  96 +test_description="database upgrade"\r
  97 +\r
  98 +. ./test-lib.sh\r
  99 +\r
 100 +tar zxf $TEST_DIRECTORY/test-databases/database-v1.tar.gz -C ${MAIL_DIR} --strip-components=1\r
 101 +\r
 102 +# XXX: Test new notmuch with old database in read-only mode\r
 103 +\r
 104 +test_begin_subtest "database upgrade from format version 1"\r
 105 +output=$(notmuch new)\r
 106 +test_expect_equal "$output" "\\r
 107 +Welcome to a new version of notmuch! Your database will now be upgraded.\r
 108 +Your notmuch database has now been upgraded to database format version 2.\r
 109 +No new mail."\r
 110 +\r
 111 +# XXX: Add some meaningful tests on the upgraded database, testing the\r
 112 +# things that have been upgraded. For folder search, this means\r
 113 +# actually having folders in the corpus.\r
 114 +\r
 115 +test_begin_subtest "Top level folder"\r
 116 +output=$(notmuch search folder:'""' | notmuch_search_sanitize)\r
 117 +test_expect_equal "$output" ""\r
 118 +\r
 119 +test_done\r
 120 -- \r
 121 1.8.5.2\r
 122 \r