From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id IJUNKVCVm2Id1gAAbAwnHQ (envelope-from ) for ; Sat, 04 Jun 2022 19:24:32 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id MLf5KFCVm2JdzQAAauVa8A (envelope-from ) for ; Sat, 04 Jun 2022 19:24:32 +0200 Received: from mail.notmuchmail.org (yantan.tethera.net [135.181.149.255]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 79B0D1CE9E for ; Sat, 4 Jun 2022 19:24:32 +0200 (CEST) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 3A34C5F7FF; Sat, 4 Jun 2022 17:23:47 +0000 (UTC) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id CB1A05F7EB for ; Sat, 4 Jun 2022 17:23:43 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id 25E315FC55; Sat, 4 Jun 2022 13:23:42 -0400 (EDT) Received: (nullmailer pid 1150068 invoked by uid 1000); Sat, 04 Jun 2022 17:23:25 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH v3 06/17] test: initial tests for notmuch-git Date: Sat, 4 Jun 2022 14:23:02 -0300 Message-Id: <20220604172313.1149879-7-david@tethera.net> X-Mailer: git-send-email 2.35.2 In-Reply-To: <20220604172313.1149879-1-david@tethera.net> References: <20220604172313.1149879-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: NYDQ5FXVAKQZUDIFYYMJAQVNCZPWYLJE X-Message-ID-Hash: NYDQ5FXVAKQZUDIFYYMJAQVNCZPWYLJE X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1654363472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post; bh=Q5OyE2hF37E6y+7Y6UcuUGmMdJXdtQqra+O8Qp22jMo=; b=AXvsqzCSILoEMyVZ0BNRQ9c+Sk3CZvVvRqNJDQ2LBWaBXmrT5GCQPsoQjmyn7nc4SUACyL 4dPbvSMIPnGbgOjeNc/9zHIuLSGP2IGm6x9tM0UuOXtGzIkP0nq8zNprSQ8DLsSwQJ1vWK yvYpVgMLLah8EYpcgtDioMnTGCu/AxF0ZG02eiYbq6dDtJcCS4LattVRmqNCm9KuL4ELiS 3KgMK9cIlM1XEFjdNBfH001xD8f8n+gc1QKe/EuHvFh+pzQE1qMrVIkWTq9tSXpfqRnGUX dlk0oXRIFcWlvTTz9xqAw8O1D518u/8HcHc+plLgNkB4B4eMo3iayRPx3cR6PQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1654363472; a=rsa-sha256; cv=none; b=nJ1jQOA1yQrs6Xk4ya8clgYDIIoorJGnF10RbeMN7PExjtspdDuQCekwPGL1uNYB1hOGJb KBG10KxKxyM8fqkeXnvpu7nlThKEs+xj2EBbxr2qlmS3obVcgd1zTLRVJ0+ZUs24i9s+rE S/m04HF3p8Uf5BQ2DDaEHXFgJCbDet+MifSHFyKvEgdxLaFs/4zQSnkXRMVr13GKOWUBS3 xFNitjgdmNvOQcbhvSsp4d2jgdzMvPTE1cEYcANNGmXL0v7mPsORCcSljdgJzRxnk+MTVC YVa2GR0zvcDw+ZwLVkW2ZGtHjQv0MD2/46PTXnTfOTwmGN4gB1XJ/ktp5cV2jg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.55 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 79B0D1CE9E X-Spam-Score: -1.55 X-Migadu-Scanner: scn0.migadu.com X-TUID: cB+ITlbV3Gkz Exercise the main functionality of notmuch-git. add_git_repos() will hopefully be simplifed when an init subcommand is added. --- notmuch-git.py | 4 +++ test/T850-git.sh | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100755 test/T850-git.sh diff --git a/notmuch-git.py b/notmuch-git.py index ce3c07bb..5475d0db 100644 --- a/notmuch-git.py +++ b/notmuch-git.py @@ -836,6 +836,10 @@ if __name__ == '__main__': level = getattr(_logging, args.log_level.upper()) _LOG.setLevel(level) + # for test suite + for var in ['NMBGIT', 'NMBPREFIX', 'NOTMUCH_PROFILE', 'NOTMUCH_CONFIG' ]: + _LOG.debug('env {:s} = {:s}'.format(var, _os.getenv(var,'%None%'))) + if not getattr(args, 'func', None): parser.print_usage() _sys.exit(1) diff --git a/test/T850-git.sh b/test/T850-git.sh new file mode 100755 index 00000000..713b326f --- /dev/null +++ b/test/T850-git.sh @@ -0,0 +1,93 @@ +#!/usr/bin/env bash +test_description='"notmuch git" to save and restore tags' +. $(dirname "$0")/test-lib.sh || exit 1 + +add_email_corpus + +git config --global user.email notmuch@example.org +git config --global user.name "Notmuch Test Suite" + +test_begin_subtest "init" +test_expect_success "notmuch git -p '' -C remote.git init" + +test_begin_subtest "clone" +test_expect_success "notmuch git -p '' -C tags.git clone remote.git" + +test_begin_subtest "commit" +notmuch git -C tags.git -p '' commit +git -C tags.git ls-tree -r --name-only HEAD | xargs dirname | sort -u | sed s,tags/,id:, > OUTPUT +notmuch search --output=messages '*' | sort > EXPECTED +test_expect_equal_file_nonempty EXPECTED OUTPUT + +test_begin_subtest "checkout" +notmuch dump > BEFORE +notmuch tag -inbox '*' +notmuch git -C tags.git -p '' checkout +notmuch dump > AFTER +test_expect_equal_file_nonempty BEFORE AFTER + +test_begin_subtest "archive" +notmuch git -C tags.git -p '' archive | tar tf - | \ + grep 20091117190054.GU3165@dottiness.seas.harvard.edu | sort > OUTPUT +cat < EXPECTED +tags/20091117190054.GU3165@dottiness.seas.harvard.edu/ +tags/20091117190054.GU3165@dottiness.seas.harvard.edu/inbox +tags/20091117190054.GU3165@dottiness.seas.harvard.edu/signed +tags/20091117190054.GU3165@dottiness.seas.harvard.edu/unread +EOF +notmuch git -C tags.git -p '' checkout +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "status" +notmuch tag +test id:20091117190054.GU3165@dottiness.seas.harvard.edu +notmuch git -C tags.git -p '' status > OUTPUT +cat < EXPECTED +A 20091117190054.GU3165@dottiness.seas.harvard.edu test +EOF +notmuch git -C tags.git -p '' checkout +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "fetch" +notmuch tag +test2 id:20091117190054.GU3165@dottiness.seas.harvard.edu +notmuch git -C remote.git -p '' commit +notmuch tag -test2 id:20091117190054.GU3165@dottiness.seas.harvard.edu +notmuch git -C tags.git -p '' fetch +notmuch git -C tags.git -p '' status > OUTPUT +cat < EXPECTED + a 20091117190054.GU3165@dottiness.seas.harvard.edu test2 +EOF +notmuch git -C tags.git -p '' checkout +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "merge" +notmuch git -C tags.git -p '' merge +notmuch dump id:20091117190054.GU3165@dottiness.seas.harvard.edu | grep -v '^#' > OUTPUT +cat < EXPECTED ++inbox +signed +test2 +unread -- id:20091117190054.GU3165@dottiness.seas.harvard.edu +EOF +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "push" +notmuch tag +test3 id:20091117190054.GU3165@dottiness.seas.harvard.edu +notmuch git -C tags.git -p '' commit +notmuch tag -test3 id:20091117190054.GU3165@dottiness.seas.harvard.edu +notmuch git -C tags.git -p '' push +notmuch git -C remote.git -p '' checkout +notmuch dump id:20091117190054.GU3165@dottiness.seas.harvard.edu | grep -v '^#' > OUTPUT +cat < EXPECTED ++inbox +signed +test2 +test3 +unread -- id:20091117190054.GU3165@dottiness.seas.harvard.edu +EOF +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "environment passed through when run as 'notmuch git'" +env NMBGIT=foo NMBPREFIX=bar NOTMUCH_PROFILE=default notmuch git -C tags.git -p '' -ldebug status |& \ + grep '^env ' | notmuch_dir_sanitize > OUTPUT +cat < EXPECTED +env NMBGIT = foo +env NMBPREFIX = bar +env NOTMUCH_PROFILE = default +env NOTMUCH_CONFIG = CWD/notmuch-config +EOF +test_expect_equal_file EXPECTED OUTPUT + +test_done -- 2.35.2