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 0CEDF431FBF for ; Wed, 3 Feb 2010 05:43:27 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -1.332 X-Spam-Level: X-Spam-Status: No, score=-1.332 tagged_above=-999 required=5 tests=[AWL=-0.592, BAYES_20=-0.74] autolearn=ham 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 DY0y5cD4AMaT for ; Wed, 3 Feb 2010 05:43:24 -0800 (PST) Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36]) by olra.theworths.org (Postfix) with ESMTP id 79210431FBD for ; Wed, 3 Feb 2010 05:43:24 -0800 (PST) Received: from localhost (unknown [192.168.200.4]) by max.feld.cvut.cz (Postfix) with ESMTP id 3120F19F3400 for ; Wed, 3 Feb 2010 14:43:04 +0100 (CET) X-Virus-Scanned: IMAP AMAVIS Received: from max.feld.cvut.cz ([192.168.200.1]) by localhost (styx.feld.cvut.cz [192.168.200.4]) (amavisd-new, port 10044) with ESMTP id CbfWugWyCjPs for ; Wed, 3 Feb 2010 14:42:59 +0100 (CET) Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34]) by max.feld.cvut.cz (Postfix) with ESMTP id A772B19F35D6 for ; Wed, 3 Feb 2010 14:42:55 +0100 (CET) Received: from localhost.localdomain (k335-30.felk.cvut.cz [147.32.86.30]) (Authenticated sender: sojkam1) by imap.feld.cvut.cz (Postfix) with ESMTPSA id 84213FA005 for ; Wed, 3 Feb 2010 14:42:55 +0100 (CET) From: Michal Sojka To: notmuch@notmuchmail.org Date: Wed, 3 Feb 2010 14:42:47 +0100 Message-Id: <1265204568-24018-3-git-send-email-sojkam1@fel.cvut.cz> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1265204568-24018-1-git-send-email-sojkam1@fel.cvut.cz> References: <1265204568-24018-1-git-send-email-sojkam1@fel.cvut.cz> Subject: [notmuch] [PATCH 3/4] Rename notmuch-test according to the new naming scheme 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: Wed, 03 Feb 2010 13:43:27 -0000 Signed-off-by: Michal Sojka --- test/notmuch-test | 220 --------------------------------------------- test/t0001-notmuch-new.sh | 220 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 220 insertions(+), 220 deletions(-) delete mode 100755 test/notmuch-test create mode 100755 test/t0001-notmuch-new.sh diff --git a/test/notmuch-test b/test/notmuch-test deleted file mode 100755 index d7b85c0..0000000 --- a/test/notmuch-test +++ /dev/null @@ -1,220 +0,0 @@ -#!/bin/sh -set -e - -find_notmuch_binary () -{ - dir=$1 - - while [ -n "$dir" ]; do - bin=$dir/notmuch - if [ -x $bin ]; then - echo $bin - return - fi - dir=$(dirname $dir) - if [ "$dir" = "/" ]; then - break - fi - done - - echo notmuch -} - -# Generate a new message in the mail directory, with -# a unique message ID and subject. -# -# The filename of the message generated is available as -# $gen_msg_filename -gen_msg_cnt=0 -gen_msg_filename="" -generate_message () -{ - gen_msg_cnt=$((gen_msg_cnt + 1)) - gen_msg_name=msg-$(printf "%03d" $gen_msg_cnt) - - if [ "$#" = "0" ]; then - gen_msg_filename="${MAIL_DIR}/$gen_msg_name" - else - gen_msg_filename="${MAIL_DIR}/$1/$gen_msg_name" - mkdir -p $(dirname $gen_msg_filename) - fi - -cat <$gen_msg_filename -From: Notmuch Test Suite -To: Notmuch Test Suite -Message-Id: -Subject: Test message ${gen_msg_filename} -Date: Tue, 05 Jan 2010 15:43:57 -0800 - -This is just a test message at ${gen_msg_filename} -EOF -} - -do_sleep () -{ - sleep 1 -} - -TEST_DIR=$(pwd)/test.$$ -MAIL_DIR=${TEST_DIR}/mail -export NOTMUCH_CONFIG=${TEST_DIR}/notmuch-config -NOTMUCH=$(find_notmuch_binary $(pwd)) - -rm -rf ${TEST_DIR} -mkdir ${TEST_DIR} -cd ${TEST_DIR} - -mkdir ${MAIL_DIR} - -cat < ${NOTMUCH_CONFIG} -[database] -path=${MAIL_DIR} - -[user] -name=Notmuch Test Suite -primary_email=test_suite@notmuchmail.org -EOF - -echo "### Testing \"notmuch new\" with no messages" -$NOTMUCH new - -echo "### Testing \"notmuch new\" with 1 new message" -do_sleep -generate_message -$NOTMUCH new - -echo "### Testing \"notmuch new\" with 2 new messages" -do_sleep -generate_message -generate_message -$NOTMUCH new - -echo "### Testing \"notmuch new\" with no new messages (and a non-empty database)" - -$NOTMUCH new - -echo "### Testing \"notmuch new\" with two new directories (one mail)" -rm -rf ${MAIL_DIR}/* ${MAIL_DIR}/.notmuch -mkdir ${MAIL_DIR}/def -mkdir ${MAIL_DIR}/ghi -generate_message def - -$NOTMUCH new - -echo "### Testing \"notmuch new\" with two new directories (one mail)---opposite inode order" - -rm -rf ${MAIL_DIR}/.notmuch -mv ${MAIL_DIR}/ghi ${MAIL_DIR}/abc -rm ${MAIL_DIR}/def/* -generate_message abc - -$NOTMUCH new - -echo "### Testing \"notmuch new\" with 1 old message moved into the mail store" -rm -rf ${MAIL_DIR}/* ${MAIL_DIR}/.notmuch -generate_message -tmp_msg_filename=tmp/$gen_msg_filename -mkdir -p $(dirname $tmp_msg_filename) -mv $gen_msg_filename $tmp_msg_filename -do_sleep -$NOTMUCH new > /dev/null -do_sleep -mv $tmp_msg_filename $gen_msg_filename -$NOTMUCH new - -echo "### Testing \"notmuch new\" with 1 renamed message" - -do_sleep -generate_message -$NOTMUCH new > /dev/null -do_sleep -mv $gen_msg_filename ${gen_msg_filename}-renamed -$NOTMUCH new - -echo "### Testing \"notmuch new\" with 1 deleted message" - -do_sleep -rm ${gen_msg_filename}-renamed -$NOTMUCH new - -echo "### Testing \"notmuch new\" with a new directory with 3 messages" - -do_sleep -generate_message dir -generate_message dir -generate_message dir - -$NOTMUCH new - -echo "### Testing \"notmuch new\" with a renamed directory of 3 messages" - -do_sleep -mv ${MAIL_DIR}/dir ${MAIL_DIR}/dir-renamed - -$NOTMUCH new - -echo "### Testing \"notmuch new\" with a deleted directory of 3 messages" - -do_sleep -rm -rf ${MAIL_DIR}/dir-renamed - -$NOTMUCH new - -echo "### Testing \"notmuch new\" with a new directory with 3 messages (tail of list)" - -do_sleep -generate_message zzz -generate_message zzz -generate_message zzz - -$NOTMUCH new - -echo "### Testing \"notmuch new\" with a deleted directory of 3 messages (tail of list)" - -do_sleep -rm -rf ${MAIL_DIR}/zzz - -$NOTMUCH new - -echo "### Testing \"notmuch new\" with a symlink to an external directory of 1 message" - -rm -rf ${MAIL_DIR}/.notmuch -mv ${MAIL_DIR} ${TEST_DIR}/actual_maildir - -mkdir ${MAIL_DIR} -ln -s ${TEST_DIR}/actual_maildir ${MAIL_DIR}/symlink - -$NOTMUCH new - -echo "### Testing \"notmuch new\" with a symlink to an external file" -do_sleep -generate_message -external_msg_filename=${TEST_DIR}/external/$(basename $gen_msg_filename) -mkdir -p $(dirname $external_msg_filename) -mv $gen_msg_filename $external_msg_filename -ln -s $external_msg_filename $gen_msg_filename - -$NOTMUCH new - -echo "### Testing \"notmuch new\" with a two-level directory with 3 files" - -do_sleep -generate_message two/levels -generate_message two/levels -generate_message two/levels - -$NOTMUCH new - -echo "### Testing \"notmuch new\" with deletion of two-level directory (3 files)" - -do_sleep -rm -rf ${MAIL_DIR}/two - -$NOTMUCH new - -cat <$gen_msg_filename +From: Notmuch Test Suite +To: Notmuch Test Suite +Message-Id: +Subject: Test message ${gen_msg_filename} +Date: Tue, 05 Jan 2010 15:43:57 -0800 + +This is just a test message at ${gen_msg_filename} +EOF +} + +do_sleep () +{ + sleep 1 +} + +TEST_DIR=$(pwd)/test.$$ +MAIL_DIR=${TEST_DIR}/mail +export NOTMUCH_CONFIG=${TEST_DIR}/notmuch-config +NOTMUCH=$(find_notmuch_binary $(pwd)) + +rm -rf ${TEST_DIR} +mkdir ${TEST_DIR} +cd ${TEST_DIR} + +mkdir ${MAIL_DIR} + +cat < ${NOTMUCH_CONFIG} +[database] +path=${MAIL_DIR} + +[user] +name=Notmuch Test Suite +primary_email=test_suite@notmuchmail.org +EOF + +echo "### Testing \"notmuch new\" with no messages" +$NOTMUCH new + +echo "### Testing \"notmuch new\" with 1 new message" +do_sleep +generate_message +$NOTMUCH new + +echo "### Testing \"notmuch new\" with 2 new messages" +do_sleep +generate_message +generate_message +$NOTMUCH new + +echo "### Testing \"notmuch new\" with no new messages (and a non-empty database)" + +$NOTMUCH new + +echo "### Testing \"notmuch new\" with two new directories (one mail)" +rm -rf ${MAIL_DIR}/* ${MAIL_DIR}/.notmuch +mkdir ${MAIL_DIR}/def +mkdir ${MAIL_DIR}/ghi +generate_message def + +$NOTMUCH new + +echo "### Testing \"notmuch new\" with two new directories (one mail)---opposite inode order" + +rm -rf ${MAIL_DIR}/.notmuch +mv ${MAIL_DIR}/ghi ${MAIL_DIR}/abc +rm ${MAIL_DIR}/def/* +generate_message abc + +$NOTMUCH new + +echo "### Testing \"notmuch new\" with 1 old message moved into the mail store" +rm -rf ${MAIL_DIR}/* ${MAIL_DIR}/.notmuch +generate_message +tmp_msg_filename=tmp/$gen_msg_filename +mkdir -p $(dirname $tmp_msg_filename) +mv $gen_msg_filename $tmp_msg_filename +do_sleep +$NOTMUCH new > /dev/null +do_sleep +mv $tmp_msg_filename $gen_msg_filename +$NOTMUCH new + +echo "### Testing \"notmuch new\" with 1 renamed message" + +do_sleep +generate_message +$NOTMUCH new > /dev/null +do_sleep +mv $gen_msg_filename ${gen_msg_filename}-renamed +$NOTMUCH new + +echo "### Testing \"notmuch new\" with 1 deleted message" + +do_sleep +rm ${gen_msg_filename}-renamed +$NOTMUCH new + +echo "### Testing \"notmuch new\" with a new directory with 3 messages" + +do_sleep +generate_message dir +generate_message dir +generate_message dir + +$NOTMUCH new + +echo "### Testing \"notmuch new\" with a renamed directory of 3 messages" + +do_sleep +mv ${MAIL_DIR}/dir ${MAIL_DIR}/dir-renamed + +$NOTMUCH new + +echo "### Testing \"notmuch new\" with a deleted directory of 3 messages" + +do_sleep +rm -rf ${MAIL_DIR}/dir-renamed + +$NOTMUCH new + +echo "### Testing \"notmuch new\" with a new directory with 3 messages (tail of list)" + +do_sleep +generate_message zzz +generate_message zzz +generate_message zzz + +$NOTMUCH new + +echo "### Testing \"notmuch new\" with a deleted directory of 3 messages (tail of list)" + +do_sleep +rm -rf ${MAIL_DIR}/zzz + +$NOTMUCH new + +echo "### Testing \"notmuch new\" with a symlink to an external directory of 1 message" + +rm -rf ${MAIL_DIR}/.notmuch +mv ${MAIL_DIR} ${TEST_DIR}/actual_maildir + +mkdir ${MAIL_DIR} +ln -s ${TEST_DIR}/actual_maildir ${MAIL_DIR}/symlink + +$NOTMUCH new + +echo "### Testing \"notmuch new\" with a symlink to an external file" +do_sleep +generate_message +external_msg_filename=${TEST_DIR}/external/$(basename $gen_msg_filename) +mkdir -p $(dirname $external_msg_filename) +mv $gen_msg_filename $external_msg_filename +ln -s $external_msg_filename $gen_msg_filename + +$NOTMUCH new + +echo "### Testing \"notmuch new\" with a two-level directory with 3 files" + +do_sleep +generate_message two/levels +generate_message two/levels +generate_message two/levels + +$NOTMUCH new + +echo "### Testing \"notmuch new\" with deletion of two-level directory (3 files)" + +do_sleep +rm -rf ${MAIL_DIR}/two + +$NOTMUCH new + +cat <