Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 37545431FC2 for ; Sun, 9 Mar 2014 14:40:47 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2AtOgwLJlP+G for ; Sun, 9 Mar 2014 14:40:42 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com [209.85.215.42]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 9E47B431FBD for ; Sun, 9 Mar 2014 14:40:41 -0700 (PDT) Received: by mail-la0-f42.google.com with SMTP id ec20so4201553lab.1 for ; Sun, 09 Mar 2014 14:40:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=ta2ffAs5HnGDoQ0uqyqxjsj2mGmNBDbUUGjaWvsNuws=; b=PEz34W2PYu52oxVUDwr87abpcn9oiSS5xoop18eBB3RjuSg1zJhq0gaCGA0mJcYOQn ZE5b1NNXmxBxXnw4vxAIIe7Ynvw3agyFNZbk3Qu/KIN4c5qKr5IkwOCOADRgSseFxUMh Zv+A7TlispUD8LgWvgDOoNOeU50VqeamIocK4yKRdHJ8a/459WD88vfEBSs/m5OnX0o9 KOkCqEkKP92kz6SqKi4m2uzHqTcaFrqoerwBhO4EKCfGUvgZtOstI8cfuoWMfythYj0u aqNXzBVgbZ3T0oJnmhWNy27ylkcdZ3ayh9GH2+Khm6oMve2vkhL+zVhSX/Y5xt+EU6gM VWfQ== X-Gm-Message-State: ALoCoQkiLq3Fi2k3Z1T5Oii/VvwGuhgXaCGM/tIQ6zNcnHtp+LswOyOVlwa+J2DcF/eOYrnbJsOC X-Received: by 10.152.6.199 with SMTP id d7mr21271797laa.22.1394401240144; Sun, 09 Mar 2014 14:40:40 -0700 (PDT) Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi. [88.195.111.91]) by mx.google.com with ESMTPSA id q4sm19397147lbl.14.2014.03.09.14.40.38 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 09 Mar 2014 14:40:39 -0700 (PDT) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH v4 01/13] test: rearrange the test corpus into subfolders Date: Sun, 9 Mar 2014 23:40:22 +0200 Message-Id: X-Mailer: git-send-email 1.9.0 In-Reply-To: References: In-Reply-To: References: X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Mar 2014 21:40:47 -0000 We will need this for improved folder search tests, but having some folders should exercise our code paths better anyway. Modify the relevant test accordingly to make it pass. --- test/T090-search-output.sh | 168 ++++++++++++++++----------------- test/corpus/{cur => }/01:2, | 0 test/corpus/{cur => }/02:2, | 0 test/corpus/{cur => bar}/17:2, | 0 test/corpus/{cur => bar}/18:2, | 0 test/corpus/{cur => bar/baz}/05:2, | 0 test/corpus/{cur => bar/baz}/23:2, | 0 test/corpus/{cur => bar/baz}/24:2, | 0 test/corpus/{ => bar/baz}/cur/25:2, | 0 test/corpus/{ => bar/baz}/cur/26:2, | 0 test/corpus/{cur => bar/baz/new}/27:2, | 0 test/corpus/{cur => bar/baz/new}/28:2, | 0 test/corpus/{ => bar}/cur/19:2, | 0 test/corpus/{ => bar}/cur/20:2, | 0 test/corpus/{cur => bar/new}/21:2, | 0 test/corpus/{cur => bar/new}/22:2, | 0 test/corpus/{cur => foo}/06:2, | 0 test/corpus/{cur => foo/baz}/11:2, | 0 test/corpus/{cur => foo/baz}/12:2, | 0 test/corpus/{ => foo/baz}/cur/13:2, | 0 test/corpus/{ => foo/baz}/cur/14:2, | 0 test/corpus/{cur => foo/baz/new}/15:2, | 0 test/corpus/{cur => foo/baz/new}/16:2, | 0 test/corpus/{ => foo}/cur/07:2, | 0 test/corpus/{ => foo}/cur/08:2, | 0 test/corpus/{cur => foo/new}/03:2, | 0 test/corpus/{cur => foo/new}/09:2, | 0 test/corpus/{cur => foo/new}/10:2, | 0 test/corpus/{cur => new}/04:2, | 0 29 files changed, 84 insertions(+), 84 deletions(-) rename test/corpus/{cur => }/01:2, (100%) rename test/corpus/{cur => }/02:2, (100%) rename test/corpus/{cur => bar}/17:2, (100%) rename test/corpus/{cur => bar}/18:2, (100%) rename test/corpus/{cur => bar/baz}/05:2, (100%) rename test/corpus/{cur => bar/baz}/23:2, (100%) rename test/corpus/{cur => bar/baz}/24:2, (100%) rename test/corpus/{ => bar/baz}/cur/25:2, (100%) rename test/corpus/{ => bar/baz}/cur/26:2, (100%) rename test/corpus/{cur => bar/baz/new}/27:2, (100%) rename test/corpus/{cur => bar/baz/new}/28:2, (100%) rename test/corpus/{ => bar}/cur/19:2, (100%) rename test/corpus/{ => bar}/cur/20:2, (100%) rename test/corpus/{cur => bar/new}/21:2, (100%) rename test/corpus/{cur => bar/new}/22:2, (100%) rename test/corpus/{cur => foo}/06:2, (100%) rename test/corpus/{cur => foo/baz}/11:2, (100%) rename test/corpus/{cur => foo/baz}/12:2, (100%) rename test/corpus/{ => foo/baz}/cur/13:2, (100%) rename test/corpus/{ => foo/baz}/cur/14:2, (100%) rename test/corpus/{cur => foo/baz/new}/15:2, (100%) rename test/corpus/{cur => foo/baz/new}/16:2, (100%) rename test/corpus/{ => foo}/cur/07:2, (100%) rename test/corpus/{ => foo}/cur/08:2, (100%) rename test/corpus/{cur => foo/new}/03:2, (100%) rename test/corpus/{cur => foo/new}/09:2, (100%) rename test/corpus/{cur => foo/new}/10:2, (100%) rename test/corpus/{cur => new}/04:2, (100%) diff --git a/test/T090-search-output.sh b/test/T090-search-output.sh index 86544ac956a1..ef28c3d157aa 100755 --- a/test/T090-search-output.sh +++ b/test/T090-search-output.sh @@ -207,35 +207,35 @@ MAIL_DIR/cur/32:2, MAIL_DIR/cur/31:2, MAIL_DIR/cur/30:2, MAIL_DIR/cur/29:2, -MAIL_DIR/cur/28:2, -MAIL_DIR/cur/27:2, -MAIL_DIR/cur/26:2, -MAIL_DIR/cur/25:2, -MAIL_DIR/cur/24:2, -MAIL_DIR/cur/23:2, -MAIL_DIR/cur/22:2, -MAIL_DIR/cur/21:2, -MAIL_DIR/cur/19:2, -MAIL_DIR/cur/18:2, +MAIL_DIR/bar/baz/new/28:2, +MAIL_DIR/bar/baz/new/27:2, +MAIL_DIR/bar/baz/cur/26:2, +MAIL_DIR/bar/baz/cur/25:2, +MAIL_DIR/bar/baz/24:2, +MAIL_DIR/bar/baz/23:2, +MAIL_DIR/bar/new/22:2, +MAIL_DIR/bar/new/21:2, +MAIL_DIR/bar/cur/19:2, +MAIL_DIR/bar/18:2, MAIL_DIR/cur/51:2, -MAIL_DIR/cur/20:2, -MAIL_DIR/cur/17:2, -MAIL_DIR/cur/16:2, -MAIL_DIR/cur/15:2, -MAIL_DIR/cur/14:2, -MAIL_DIR/cur/13:2, -MAIL_DIR/cur/12:2, -MAIL_DIR/cur/11:2, -MAIL_DIR/cur/10:2, -MAIL_DIR/cur/09:2, -MAIL_DIR/cur/08:2, -MAIL_DIR/cur/06:2, -MAIL_DIR/cur/05:2, -MAIL_DIR/cur/04:2, -MAIL_DIR/cur/03:2, -MAIL_DIR/cur/07:2, -MAIL_DIR/cur/02:2, -MAIL_DIR/cur/01:2, +MAIL_DIR/bar/cur/20:2, +MAIL_DIR/bar/17:2, +MAIL_DIR/foo/baz/new/16:2, +MAIL_DIR/foo/baz/new/15:2, +MAIL_DIR/foo/baz/cur/14:2, +MAIL_DIR/foo/baz/cur/13:2, +MAIL_DIR/foo/baz/12:2, +MAIL_DIR/foo/baz/11:2, +MAIL_DIR/foo/new/10:2, +MAIL_DIR/foo/new/09:2, +MAIL_DIR/foo/cur/08:2, +MAIL_DIR/foo/06:2, +MAIL_DIR/bar/baz/05:2, +MAIL_DIR/new/04:2, +MAIL_DIR/foo/new/03:2, +MAIL_DIR/foo/cur/07:2, +MAIL_DIR/02:2, +MAIL_DIR/01:2, EOF test_expect_equal_file OUTPUT EXPECTED @@ -266,34 +266,34 @@ MAIL_DIR/cur/32:2, MAIL_DIR/cur/31:2, MAIL_DIR/cur/30:2, MAIL_DIR/cur/29:2, -MAIL_DIR/cur/28:2, -MAIL_DIR/cur/27:2, -MAIL_DIR/cur/26:2, -MAIL_DIR/cur/25:2, -MAIL_DIR/cur/24:2, -MAIL_DIR/cur/23:2, -MAIL_DIR/cur/22:2, -MAIL_DIR/cur/21:2, -MAIL_DIR/cur/19:2, -MAIL_DIR/cur/18:2, -MAIL_DIR/cur/20:2, -MAIL_DIR/cur/17:2, -MAIL_DIR/cur/16:2, -MAIL_DIR/cur/15:2, -MAIL_DIR/cur/14:2, -MAIL_DIR/cur/13:2, -MAIL_DIR/cur/12:2, -MAIL_DIR/cur/11:2, -MAIL_DIR/cur/10:2, -MAIL_DIR/cur/09:2, -MAIL_DIR/cur/08:2, -MAIL_DIR/cur/06:2, -MAIL_DIR/cur/05:2, -MAIL_DIR/cur/04:2, -MAIL_DIR/cur/03:2, -MAIL_DIR/cur/07:2, -MAIL_DIR/cur/02:2, -MAIL_DIR/cur/01:2, +MAIL_DIR/bar/baz/new/28:2, +MAIL_DIR/bar/baz/new/27:2, +MAIL_DIR/bar/baz/cur/26:2, +MAIL_DIR/bar/baz/cur/25:2, +MAIL_DIR/bar/baz/24:2, +MAIL_DIR/bar/baz/23:2, +MAIL_DIR/bar/new/22:2, +MAIL_DIR/bar/new/21:2, +MAIL_DIR/bar/cur/19:2, +MAIL_DIR/bar/18:2, +MAIL_DIR/bar/cur/20:2, +MAIL_DIR/bar/17:2, +MAIL_DIR/foo/baz/new/16:2, +MAIL_DIR/foo/baz/new/15:2, +MAIL_DIR/foo/baz/cur/14:2, +MAIL_DIR/foo/baz/cur/13:2, +MAIL_DIR/foo/baz/12:2, +MAIL_DIR/foo/baz/11:2, +MAIL_DIR/foo/new/10:2, +MAIL_DIR/foo/new/09:2, +MAIL_DIR/foo/cur/08:2, +MAIL_DIR/foo/06:2, +MAIL_DIR/bar/baz/05:2, +MAIL_DIR/new/04:2, +MAIL_DIR/foo/new/03:2, +MAIL_DIR/foo/cur/07:2, +MAIL_DIR/02:2, +MAIL_DIR/01:2, EOF test_expect_equal_file OUTPUT EXPECTED @@ -324,35 +324,35 @@ cat <EXPECTED "MAIL_DIR/cur/31:2,", "MAIL_DIR/cur/30:2,", "MAIL_DIR/cur/29:2,", -"MAIL_DIR/cur/28:2,", -"MAIL_DIR/cur/27:2,", -"MAIL_DIR/cur/26:2,", -"MAIL_DIR/cur/25:2,", -"MAIL_DIR/cur/24:2,", -"MAIL_DIR/cur/23:2,", -"MAIL_DIR/cur/22:2,", -"MAIL_DIR/cur/21:2,", -"MAIL_DIR/cur/19:2,", -"MAIL_DIR/cur/18:2,", +"MAIL_DIR/bar/baz/new/28:2,", +"MAIL_DIR/bar/baz/new/27:2,", +"MAIL_DIR/bar/baz/cur/26:2,", +"MAIL_DIR/bar/baz/cur/25:2,", +"MAIL_DIR/bar/baz/24:2,", +"MAIL_DIR/bar/baz/23:2,", +"MAIL_DIR/bar/new/22:2,", +"MAIL_DIR/bar/new/21:2,", +"MAIL_DIR/bar/cur/19:2,", +"MAIL_DIR/bar/18:2,", "MAIL_DIR/cur/51:2,", -"MAIL_DIR/cur/20:2,", -"MAIL_DIR/cur/17:2,", -"MAIL_DIR/cur/16:2,", -"MAIL_DIR/cur/15:2,", -"MAIL_DIR/cur/14:2,", -"MAIL_DIR/cur/13:2,", -"MAIL_DIR/cur/12:2,", -"MAIL_DIR/cur/11:2,", -"MAIL_DIR/cur/10:2,", -"MAIL_DIR/cur/09:2,", -"MAIL_DIR/cur/08:2,", -"MAIL_DIR/cur/06:2,", -"MAIL_DIR/cur/05:2,", -"MAIL_DIR/cur/04:2,", -"MAIL_DIR/cur/03:2,", -"MAIL_DIR/cur/07:2,", -"MAIL_DIR/cur/02:2,", -"MAIL_DIR/cur/01:2,"] +"MAIL_DIR/bar/cur/20:2,", +"MAIL_DIR/bar/17:2,", +"MAIL_DIR/foo/baz/new/16:2,", +"MAIL_DIR/foo/baz/new/15:2,", +"MAIL_DIR/foo/baz/cur/14:2,", +"MAIL_DIR/foo/baz/cur/13:2,", +"MAIL_DIR/foo/baz/12:2,", +"MAIL_DIR/foo/baz/11:2,", +"MAIL_DIR/foo/new/10:2,", +"MAIL_DIR/foo/new/09:2,", +"MAIL_DIR/foo/cur/08:2,", +"MAIL_DIR/foo/06:2,", +"MAIL_DIR/bar/baz/05:2,", +"MAIL_DIR/new/04:2,", +"MAIL_DIR/foo/new/03:2,", +"MAIL_DIR/foo/cur/07:2,", +"MAIL_DIR/02:2,", +"MAIL_DIR/01:2,"] EOF test_expect_equal_file OUTPUT EXPECTED diff --git a/test/corpus/cur/01:2, b/test/corpus/01:2, similarity index 100% rename from test/corpus/cur/01:2, rename to test/corpus/01:2, diff --git a/test/corpus/cur/02:2, b/test/corpus/02:2, similarity index 100% rename from test/corpus/cur/02:2, rename to test/corpus/02:2, diff --git a/test/corpus/cur/17:2, b/test/corpus/bar/17:2, similarity index 100% rename from test/corpus/cur/17:2, rename to test/corpus/bar/17:2, diff --git a/test/corpus/cur/18:2, b/test/corpus/bar/18:2, similarity index 100% rename from test/corpus/cur/18:2, rename to test/corpus/bar/18:2, diff --git a/test/corpus/cur/05:2, b/test/corpus/bar/baz/05:2, similarity index 100% rename from test/corpus/cur/05:2, rename to test/corpus/bar/baz/05:2, diff --git a/test/corpus/cur/23:2, b/test/corpus/bar/baz/23:2, similarity index 100% rename from test/corpus/cur/23:2, rename to test/corpus/bar/baz/23:2, diff --git a/test/corpus/cur/24:2, b/test/corpus/bar/baz/24:2, similarity index 100% rename from test/corpus/cur/24:2, rename to test/corpus/bar/baz/24:2, diff --git a/test/corpus/cur/25:2, b/test/corpus/bar/baz/cur/25:2, similarity index 100% rename from test/corpus/cur/25:2, rename to test/corpus/bar/baz/cur/25:2, diff --git a/test/corpus/cur/26:2, b/test/corpus/bar/baz/cur/26:2, similarity index 100% rename from test/corpus/cur/26:2, rename to test/corpus/bar/baz/cur/26:2, diff --git a/test/corpus/cur/27:2, b/test/corpus/bar/baz/new/27:2, similarity index 100% rename from test/corpus/cur/27:2, rename to test/corpus/bar/baz/new/27:2, diff --git a/test/corpus/cur/28:2, b/test/corpus/bar/baz/new/28:2, similarity index 100% rename from test/corpus/cur/28:2, rename to test/corpus/bar/baz/new/28:2, diff --git a/test/corpus/cur/19:2, b/test/corpus/bar/cur/19:2, similarity index 100% rename from test/corpus/cur/19:2, rename to test/corpus/bar/cur/19:2, diff --git a/test/corpus/cur/20:2, b/test/corpus/bar/cur/20:2, similarity index 100% rename from test/corpus/cur/20:2, rename to test/corpus/bar/cur/20:2, diff --git a/test/corpus/cur/21:2, b/test/corpus/bar/new/21:2, similarity index 100% rename from test/corpus/cur/21:2, rename to test/corpus/bar/new/21:2, diff --git a/test/corpus/cur/22:2, b/test/corpus/bar/new/22:2, similarity index 100% rename from test/corpus/cur/22:2, rename to test/corpus/bar/new/22:2, diff --git a/test/corpus/cur/06:2, b/test/corpus/foo/06:2, similarity index 100% rename from test/corpus/cur/06:2, rename to test/corpus/foo/06:2, diff --git a/test/corpus/cur/11:2, b/test/corpus/foo/baz/11:2, similarity index 100% rename from test/corpus/cur/11:2, rename to test/corpus/foo/baz/11:2, diff --git a/test/corpus/cur/12:2, b/test/corpus/foo/baz/12:2, similarity index 100% rename from test/corpus/cur/12:2, rename to test/corpus/foo/baz/12:2, diff --git a/test/corpus/cur/13:2, b/test/corpus/foo/baz/cur/13:2, similarity index 100% rename from test/corpus/cur/13:2, rename to test/corpus/foo/baz/cur/13:2, diff --git a/test/corpus/cur/14:2, b/test/corpus/foo/baz/cur/14:2, similarity index 100% rename from test/corpus/cur/14:2, rename to test/corpus/foo/baz/cur/14:2, diff --git a/test/corpus/cur/15:2, b/test/corpus/foo/baz/new/15:2, similarity index 100% rename from test/corpus/cur/15:2, rename to test/corpus/foo/baz/new/15:2, diff --git a/test/corpus/cur/16:2, b/test/corpus/foo/baz/new/16:2, similarity index 100% rename from test/corpus/cur/16:2, rename to test/corpus/foo/baz/new/16:2, diff --git a/test/corpus/cur/07:2, b/test/corpus/foo/cur/07:2, similarity index 100% rename from test/corpus/cur/07:2, rename to test/corpus/foo/cur/07:2, diff --git a/test/corpus/cur/08:2, b/test/corpus/foo/cur/08:2, similarity index 100% rename from test/corpus/cur/08:2, rename to test/corpus/foo/cur/08:2, diff --git a/test/corpus/cur/03:2, b/test/corpus/foo/new/03:2, similarity index 100% rename from test/corpus/cur/03:2, rename to test/corpus/foo/new/03:2, diff --git a/test/corpus/cur/09:2, b/test/corpus/foo/new/09:2, similarity index 100% rename from test/corpus/cur/09:2, rename to test/corpus/foo/new/09:2, diff --git a/test/corpus/cur/10:2, b/test/corpus/foo/new/10:2, similarity index 100% rename from test/corpus/cur/10:2, rename to test/corpus/foo/new/10:2, diff --git a/test/corpus/cur/04:2, b/test/corpus/new/04:2, similarity index 100% rename from test/corpus/cur/04:2, rename to test/corpus/new/04:2, -- 1.9.0