c1/8e98cdd24ca52a6ab92acad04f1c9f76a32dd9

   1 Return-Path: <bremner@tethera.net>\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 7B52C429E21\r
   6         for <notmuch@notmuchmail.org>; Sun, 11 Sep 2011 16:12:07 -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 taAMKUiEE45i for <notmuch@notmuchmail.org>;\r
  16         Sun, 11 Sep 2011 16:12:07 -0700 (PDT)\r
  17 Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])\r
  18         (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
  19         (No client certificate requested)\r
  20         by olra.theworths.org (Postfix) with ESMTPS id E932A431FB6\r
  21         for <notmuch@notmuchmail.org>; Sun, 11 Sep 2011 16:12:06 -0700 (PDT)\r
  22 Received: from zancas.localnet\r
  23         (fctnnbsc36w-156034073093.pppoe-dynamic.High-Speed.nb.bellaliant.net\r
  24         [156.34.73.93]) (authenticated bits=0)\r
  25         by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p8BNC08Q010964\r
  26         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);\r
  27         Sun, 11 Sep 2011 20:12:02 -0300\r
  28 Received: from bremner by zancas.localnet with local (Exim 4.76)\r
  29         (envelope-from <bremner@tethera.net>)\r
  30         id 1R2tBv-0008PL-P7; Sun, 11 Sep 2011 20:11:59 -0300\r
  31 From: david@tethera.net\r
  32 To: notmuch@notmuchmail.org\r
  33 Subject: [PATCH] test: reset known_broken status in test_expect_equal and\r
  34         test_expect_equal_file\r
  35 Date: Sun, 11 Sep 2011 20:11:54 -0300\r
  36 Message-Id: <1315782714-32287-1-git-send-email-david@tethera.net>\r
  37 X-Mailer: git-send-email 1.7.5.4\r
  38 In-Reply-To: <1309752441-10651-3-git-send-email-dmitry.kurochkin@gmail.com>\r
  39 References: <1309752441-10651-3-git-send-email-dmitry.kurochkin@gmail.com>\r
  40 Cc: David Bremner <bremner@debian.org>\r
  41 X-BeenThere: notmuch@notmuchmail.org\r
  42 X-Mailman-Version: 2.1.13\r
  43 Precedence: list\r
  44 List-Id: "Use and development of the notmuch mail system."\r
  45         <notmuch.notmuchmail.org>\r
  46 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  47         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  48 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  49 List-Post: <mailto:notmuch@notmuchmail.org>\r
  50 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  51 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  52         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  53 X-List-Received-Date: Sun, 11 Sep 2011 23:12:07 -0000\r
  54 \r
  55 From: David Bremner <bremner@debian.org>\r
  56 \r
  57 Commit 4cc6727 introduced the library function\r
  58 test_subtest_known_broken which sets a variable\r
  59 test_subtest_known_broken_ . Unfortunately this variable is not reset\r
  60 if test_begin_subtest is not called before the next\r
  61 test_expect_success or test_expect_failure.\r
  62 \r
  63 This commit remedies that, under the assumption that exactly one\r
  64 test_expect_equal or test_expect_equal_file will follow a\r
  65 test_begin_subtest\r
  66 ---\r
  67 \r
  68 Any comments on this? I didn't follow a lot of the original\r
  69 discussions on the test API very closely. Mainly I want to know if the \r
  70 assumption at the end of the commit message seems reasonable.\r
  71 \r
  72  test/test-lib.sh |    2 ++\r
  73  1 files changed, 2 insertions(+), 0 deletions(-)\r
  74 \r
  75 diff --git a/test/test-lib.sh b/test/test-lib.sh\r
  76 index 196ef49..3c2768c 100755\r
  77 --- a/test/test-lib.sh\r
  78 +++ b/test/test-lib.sh\r
  79 @@ -460,6 +460,7 @@ test_expect_equal ()\r
  80                         test_failure_ "$test_subtest_name" "$(diff -u $testname.expected $testname.output)"\r
  81                 fi\r
  82      fi\r
  83 +       test_subtest_known_broken_=\r
  84  }\r
  85  \r
  86  test_expect_equal_file ()\r
  87 @@ -483,6 +484,7 @@ test_expect_equal_file ()\r
  88                         test_failure_ "$test_subtest_name" "$(diff -u $testname.expected $testname.output)"\r
  89                 fi\r
  90      fi\r
  91 +       test_subtest_known_broken_=\r
  92  }\r
  93  \r
  94  NOTMUCH_NEW ()\r
  95 -- \r
  96 1.7.5.4\r
  97 \r