From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 6779E431FD0 for ; Mon, 20 Dec 2010 19:52:23 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org 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 GEeMhKejEbio for ; Mon, 20 Dec 2010 19:52:22 -0800 (PST) Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 83022431FB6 for ; Mon, 20 Dec 2010 19:52:22 -0800 (PST) Received: from zancas.localnet (fctnnbsc30w-142167185189.pppoe-dynamic.High-Speed.nb.bellaliant.net [142.167.185.189]) (authenticated bits=0) by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id oBL3qCDs030839 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Mon, 20 Dec 2010 23:52:13 -0400 Received: from bremner by zancas.localnet with local (Exim 4.72) (envelope-from ) id 1PUtFU-0001VZ-Ig; Mon, 20 Dec 2010 23:50:52 -0400 From: David Bremner To: 603308@bugs.debian.org Subject: better timeout patch. User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.2.1 (x86_64-pc-linux-gnu) Message-ID: <87fwtreqcj.fsf@zancas.localnet> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Mailman-Approved-At: Tue, 11 Jan 2011 13:38:14 -0800 Cc: notmuch@notmuchmail.org 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: , Date: Tue, 21 Dec 2010 03:52:23 -0000 X-Original-Date: Mon, 20 Dec 2010 23:50:52 -0400 X-List-Received-Date: Tue, 21 Dec 2010 03:52:23 -0000 --=-=-= Here is a timeout patch that actually seems to work. Also attached are the diffs to debian/changelog to update to 0.5+nmu2. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-tests-Add-optional-use-of-timeout-utility-if-present.patch Content-Description: add timeout to test. >From f8e8ea0058ca2e57fececc3f01cc05ece0c3c3c8 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 19 Dec 2010 21:48:59 -0400 Subject: [PATCH 1/2] tests: Add optional use of timeout utility, if present. Each top level test (basic, corpus, etc...) is run with a fixed timeout of 10m. The goal here is to treat a hung test as a failure. The emacs test for sending mail is known to be problematic on the debian autobuilders. This is both a bandaid fix for that, and a sensible long term feature. --- test/notmuch-test | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/test/notmuch-test b/test/notmuch-test index b51045a..b75bc40 100755 --- a/test/notmuch-test +++ b/test/notmuch-test @@ -21,9 +21,17 @@ TESTS="basic new search json thread-naming raw reply dump-restore uuencode threa # Clean up any results from a previous run rm -r test-results >/dev/null 2>/dev/null +# test for timeout utility +if command -v timeout >/dev/null; then + TEST_TIMEOUT_CMD="timeout 10m " + echo "INFO: using 10 minute timeout for tests" +else + TEST_TIMEOUT_CMD="" +fi + # Run the tests for test in $TESTS; do - ./$test "$@" + $TEST_TIMEOUT_CMD ./$test "$@" done # Report results -- 1.7.2.3 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-Add-NMU-stanzas-to-changelog.patch Content-Description: changelog diff >From 6998bffbaf2b4d683b8ce0b1706b3636d60a6559 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 14 Dec 2010 22:24:38 -0400 Subject: [PATCH 2/2] Add NMU stanzas to changelog --- debian/changelog | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/debian/changelog b/debian/changelog index cc758b9..790f34b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +notmuch (0.5+nmu2) experimental; urgency=low + + * Non-maintainer upload. + * Second try at timeout for test. Put timeouts at top level. + + -- David Bremner Sun, 19 Dec 2010 21:40:08 -0400 + +notmuch (0.5+nmu1) experimental; urgency=low + + * Non-maintainer upload. + * Add a timeout to emacs tests to hopefully work around build failures. + + -- David Bremner Tue, 14 Dec 2010 22:23:51 -0400 + notmuch (0.5) unstable; urgency=low * new: maildir-flag synchronization -- 1.7.2.3 --=-=-=--