e0/89f4814e6cb908c07e754bbaf4b05544fcaf93

   1 Return-Path: <dmitry.kurochkin@gmail.com>\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 A068F429E29\r
   6         for <notmuch@notmuchmail.org>; Mon,  9 May 2011 20:30:57 -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: -0.799\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_FROM=0.001, 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 pYXiRKpHIvr0 for <notmuch@notmuchmail.org>;\r
  17         Mon,  9 May 2011 20:30:57 -0700 (PDT)\r
  18 Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com\r
  19         [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id EFA8E429E26\r
  22         for <notmuch@notmuchmail.org>; Mon,  9 May 2011 20:30:56 -0700 (PDT)\r
  23 Received: by bwg12 with SMTP id 12so5033541bwg.26\r
  24         for <notmuch@notmuchmail.org>; Mon, 09 May 2011 20:30:55 -0700 (PDT)\r
  25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
  26         h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer\r
  27         :in-reply-to:references;\r
  28         bh=G9nlO57K8G6B0fBpBiFcPfjsACAPudI5jnCUY06vojs=;\r
  29         b=hNIbentIvnV1Snx2gf8LXKrY6kVXyQ1kQOHtX18ogEmfLawt7aJl01s4yz3bhr3co0\r
  30         oHobjIFcWnSBHo7L/gbzkx/mwPc8tsUbs/EDh3DVmFXuQTIWy4smLDdsNRC+cojDT1jX\r
  31         CPILqex7JvP7azK7fGHLp3RXXDwfXEMhrCyak=\r
  32 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;\r
  33         h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
  34         b=ruQR0p8drM6v9ikcyY9T0JmapMgzLwWwPHGH/RTsDzTrJYjp5iXsOXSsHUT32bi1bv\r
  35         RvR3mqGAwd5T+O3dx9MGrclcytd3fPIWJe9NtPaTBlP5PWrj2Hd2fStU8rir8CesSIPC\r
  36         i8F28REHs/gK4D6kxz1gaKHwVh81GMgnT4T5Q=\r
  37 Received: by 10.204.76.73 with SMTP id b9mr6508350bkk.211.1304998255294;\r
  38         Mon, 09 May 2011 20:30:55 -0700 (PDT)\r
  39 Received: from localhost ([91.144.186.21])\r
  40         by mx.google.com with ESMTPS id a28sm321519fak.1.2011.05.09.20.30.54\r
  41         (version=TLSv1/SSLv3 cipher=OTHER);\r
  42         Mon, 09 May 2011 20:30:54 -0700 (PDT)\r
  43 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
  44 To: Notmuch Mail <notmuch@notmuchmail.org>\r
  45 Subject: [PATCH 1/2] test: copy files in test_expect_equal_file instead of\r
  46         moving them\r
  47 Date: Tue, 10 May 2011 07:30:50 +0400\r
  48 Message-Id: <1304998251-28700-2-git-send-email-dmitry.kurochkin@gmail.com>\r
  49 X-Mailer: git-send-email 1.7.5.1\r
  50 In-Reply-To: <1304998251-28700-1-git-send-email-dmitry.kurochkin@gmail.com>\r
  51 References: <1304998251-28700-1-git-send-email-dmitry.kurochkin@gmail.com>\r
  52 X-BeenThere: notmuch@notmuchmail.org\r
  53 X-Mailman-Version: 2.1.13\r
  54 Precedence: list\r
  55 List-Id: "Use and development of the notmuch mail system."\r
  56         <notmuch.notmuchmail.org>\r
  57 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  58         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  59 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  60 List-Post: <mailto:notmuch@notmuchmail.org>\r
  61 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  62 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  63         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  64 X-List-Received-Date: Tue, 10 May 2011 03:30:57 -0000\r
  65 \r
  66 Before the change, test_expect_equal_file moved files it compared\r
  67 in case of failure.  The patch changes it to copy the files\r
  68 instead.  This allows testing non-temporary files which are\r
  69 stored in git.\r
  70 \r
  71 Note: the change should not result in new temporary files left\r
  72 after the tests.  Test_expect_equal_file used to move files only\r
  73 on failure, so callers had to cleanup them anyway.\r
  74 ---\r
  75  test/test-lib.sh |    4 ++--\r
  76  1 files changed, 2 insertions(+), 2 deletions(-)\r
  77 \r
  78 diff --git a/test/test-lib.sh b/test/test-lib.sh\r
  79 index eaf5051..7cc43cd 100755\r
  80 --- a/test/test-lib.sh\r
  81 +++ b/test/test-lib.sh\r
  82 @@ -477,8 +477,8 @@ test_expect_equal_file ()\r
  83                         test_ok_ "$test_subtest_name"\r
  84                 else\r
  85                         testname=$this_test.$test_count\r
  86 -                       mv "$output" $testname.output\r
  87 -                       mv "$expected" $testname.expected\r
  88 +                       cp "$output" $testname.output\r
  89 +                       cp "$expected" $testname.expected\r
  90                         test_failure_ "$test_subtest_name" "$(diff -u $testname.expected $testname.output)"\r
  91                 fi\r
  92      fi\r
  93 -- \r
  94 1.7.5.1\r
  95 \r