From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id mGzvOD4qiWL3vAAAbAwnHQ (envelope-from ) for ; Sat, 21 May 2022 20:06:55 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id YAveOD4qiWKX/AAAauVa8A (envelope-from ) for ; Sat, 21 May 2022 20:06:54 +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 1C76D3D17A for ; Sat, 21 May 2022 20:06:51 +0200 (CEST) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 87D8E5F78A; Sat, 21 May 2022 18:06:42 +0000 (UTC) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 50FAA5F77A for ; Sat, 21 May 2022 18:06:39 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id C51D05FC01; Sat, 21 May 2022 14:06:38 -0400 (EDT) Received: (nullmailer pid 2419244 invoked by uid 1000); Sat, 21 May 2022 18:06:36 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 2/3] test: replace deprecated use of notmuch_database_open Date: Sat, 21 May 2022 15:06:30 -0300 Message-Id: <20220521180631.2419225-2-david@tethera.net> X-Mailer: git-send-email 2.35.2 In-Reply-To: <20220521180631.2419225-1-david@tethera.net> References: <20220521180631.2419225-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: 35VMMYJKKKW4SIQTR3B6KFCSRDUT5X6D X-Message-ID-Hash: 35VMMYJKKKW4SIQTR3B6KFCSRDUT5X6D 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=1653156411; 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=MfSlG7VLVl8hIgKlI80AT8l8UeTqDUJpiTnsBCw6XAs=; b=X3O7x8aNjlcL0dBZYCjI1mDMvnw1bIzBFJIJTxVNOqiMOTr8a83Z9T2taYKEeQbA8AfVax 1Z2VRDplkMfqjpHDuRqd62eHBsIywRt9xzyw51/swKy6LCzddE5ESGpXl4tGu0X+liwLSy SXQ834niM6w5zz9LziA4AVFV0bTzkstCGzOg8MF5ZlKc+fC4e3wJWyCD68+6IazJ8epWIg XnEVlRdDyAuS61ilaFKwEHVIQUN9jsxwLxZuob7Sx3jMJgt7YpjifOMV3DEvHJI1W+xAOZ AuLkS0dRT1dKllfT8gYKnLe8heDSAGefIz5f5JCJR+sp04l7/ci8pQUrPP+pwA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1653156411; a=rsa-sha256; cv=none; b=ufCT+IRxCkAzxNBwukBtipgodHCoF2AMf8Utl/HlRZKYi3srCo7m43gCHnjNqwwWLrTLYK mPNEEz0tPifIwqpBslSBmJpyCErD3GwnaSrACvrzhgHUrErfbQ1mvk17pOFD5zlkP2WJJE vjbBMTKVMdqOqEQ23dmgHyM11nVlsf36n6g/epaQFvNr6ZDftgXFtEIyurW6hkZQqMMdJS es/AFXDscXa0Y4KXFRfShKyrrcjBl4DtREg/achXON+YMJTibYMFhoXIQXeJwkV9j9mbbe pgmJxdSi+od/ZTh4uetyjap9Trcfk4raNwYhOrW8RK+MtFoSR2IxRp4gQq8uGw== 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.94 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: 1C76D3D17A X-Spam-Score: -1.94 X-Migadu-Scanner: scn0.migadu.com X-TUID: BEt4NzeRmcXj This is a bit more involved than replacing the use of notmuch_database_open_verbose, as we have to effectively inline the definition of notmuch_database_open. --- test/T560-lib-error.sh | 28 +++++++++++++++++++++++----- test/T570-revision-tracking.sh | 7 ++++++- test/T610-message-property.sh | 6 +++++- test/T620-lock.sh | 14 ++++++++++++-- test/T640-database-modified.sh | 12 ++++++++++-- test/T720-lib-lifetime.sh | 8 +++++++- 6 files changed, 63 insertions(+), 12 deletions(-) diff --git a/test/T560-lib-error.sh b/test/T560-lib-error.sh index 1d45dc7d..470537cc 100755 --- a/test/T560-lib-error.sh +++ b/test/T560-lib-error.sh @@ -16,7 +16,11 @@ int main (int argc, char** argv) { notmuch_database_t *db; notmuch_status_t stat; - stat = notmuch_database_open (NULL, 0, 0); + char* msg = NULL; + stat = notmuch_database_open_with_config (NULL, + NOTMUCH_DATABASE_MODE_READ_ONLY, + "", NULL, &db, &msg); + if (msg) fputs (msg, stderr); } EOF cat <<'EOF' >EXPECTED @@ -34,7 +38,11 @@ int main (int argc, char** argv) { notmuch_database_t *db; notmuch_status_t stat; - stat = notmuch_database_open ("./nonexistent/foo", 0, 0); + char *msg = NULL; + stat = notmuch_database_open_with_config ("./nonexistent/foo", + NOTMUCH_DATABASE_MODE_READ_ONLY, + "", NULL, &db, &msg); + if (msg) fputs (msg, stderr); } EOF cat <<'EOF' >EXPECTED @@ -70,7 +78,11 @@ int main (int argc, char** argv) { notmuch_database_t *db; notmuch_status_t stat; - stat = notmuch_database_open (argv[1], 0, 0); + char* msg = NULL; + stat = notmuch_database_open_with_config (argv[1], + NOTMUCH_DATABASE_MODE_READ_ONLY, + "", NULL, &db, &msg); + if (msg) fputs (msg, stderr); } EOF cat <<'EOF' >EXPECTED @@ -123,7 +135,11 @@ int main (int argc, char** argv) { notmuch_database_t *db; notmuch_status_t stat; - stat = notmuch_database_open (argv[1], NOTMUCH_DATABASE_MODE_READ_ONLY, &db); + char* msg = NULL; + stat = notmuch_database_open_with_config (argv[1], + NOTMUCH_DATABASE_MODE_READ_ONLY, + "", NULL, &db, &msg); + if (msg) fputs (msg, stderr); if (stat != NOTMUCH_STATUS_SUCCESS) { fprintf (stderr, "error opening database: %d\n", stat); } @@ -148,7 +164,9 @@ int main (int argc, char** argv) { notmuch_database_t *db; notmuch_status_t stat; - stat = notmuch_database_open (argv[1], NOTMUCH_DATABASE_MODE_READ_WRITE, &db); + stat = notmuch_database_open_with_config (argv[1], + NOTMUCH_DATABASE_MODE_READ_WRITE, + "", NULL, &db, NULL); if (stat != NOTMUCH_STATUS_SUCCESS) { fprintf (stderr, "error opening database: %d\n", stat); } diff --git a/test/T570-revision-tracking.sh b/test/T570-revision-tracking.sh index a59e7c98..e1cc684d 100755 --- a/test/T570-revision-tracking.sh +++ b/test/T570-revision-tracking.sh @@ -19,7 +19,12 @@ int main (int argc, char** argv) unsigned long rev; - stat = notmuch_database_open (argv[1], NOTMUCH_DATABASE_MODE_READ_ONLY, &db); + char* msg = NULL; + stat = notmuch_database_open_with_config (argv[1], + NOTMUCH_DATABASE_MODE_READ_ONLY, + "", NULL, &db, &msg); + if (msg) fputs (msg, stderr); + if (stat) fputs ("open failed\n", stderr); revision = notmuch_database_get_revision (db, &uuid); diff --git a/test/T610-message-property.sh b/test/T610-message-property.sh index 4ec85474..2685f3b5 100755 --- a/test/T610-message-property.sh +++ b/test/T610-message-property.sh @@ -23,8 +23,12 @@ int main (int argc, char** argv) notmuch_message_t *message = NULL; const char *val; notmuch_status_t stat; + char* msg = NULL; - EXPECT0(notmuch_database_open (argv[1], NOTMUCH_DATABASE_MODE_READ_WRITE, &db)); + EXPECT0(notmuch_database_open_with_config (argv[1], + NOTMUCH_DATABASE_MODE_READ_WRITE, + "", NULL, &db, &msg)); + if (msg) fputs (msg, stderr); EXPECT0(notmuch_database_find_message(db, "4EFC743A.3060609@april.org", &message)); if (message == NULL) { fprintf (stderr, "unable to find message"); diff --git a/test/T620-lock.sh b/test/T620-lock.sh index 8f4c380f..99cc7010 100755 --- a/test/T620-lock.sh +++ b/test/T620-lock.sh @@ -40,15 +40,25 @@ main (int argc, char **argv) if (child == 0) { notmuch_database_t *db2; + char* msg = NULL; sleep (1); - EXPECT0 (notmuch_database_open (path, NOTMUCH_DATABASE_MODE_READ_WRITE, &db2)); + + EXPECT0(notmuch_database_open_with_config (argv[1], + NOTMUCH_DATABASE_MODE_READ_WRITE, + "", NULL, &db2, &msg)); + if (msg) fputs (msg, stderr); + taggit (db2, "child"); EXPECT0 (notmuch_database_close (db2)); } else { notmuch_database_t *db; + char* msg = NULL; - EXPECT0 (notmuch_database_open (path, NOTMUCH_DATABASE_MODE_READ_WRITE, &db)); + EXPECT0(notmuch_database_open_with_config (argv[1], + NOTMUCH_DATABASE_MODE_READ_WRITE, + "", NULL, &db, &msg)); + if (msg) fputs (msg, stderr); taggit (db, "parent"); sleep (2); EXPECT0 (notmuch_database_close (db)); diff --git a/test/T640-database-modified.sh b/test/T640-database-modified.sh index 636b20c7..2c3fa735 100755 --- a/test/T640-database-modified.sh +++ b/test/T640-database-modified.sh @@ -23,14 +23,22 @@ main (int argc, char **argv) notmuch_query_t *query; notmuch_tags_t *tags; int i; + char* msg = NULL; - EXPECT0 (notmuch_database_open (path, NOTMUCH_DATABASE_MODE_READ_ONLY, &ro_db)); + EXPECT0(notmuch_database_open_with_config (argv[1], + NOTMUCH_DATABASE_MODE_READ_ONLY, + "", NULL, &ro_db, &msg)); + if (msg) fputs (msg, stderr); assert(ro_db); EXPECT0 (notmuch_database_find_message (ro_db, "${first_id}", &ro_message)); assert(ro_message); - EXPECT0 (notmuch_database_open (path, NOTMUCH_DATABASE_MODE_READ_WRITE, &rw_db)); + EXPECT0(notmuch_database_open_with_config (argv[1], + NOTMUCH_DATABASE_MODE_READ_WRITE, + "", NULL, &rw_db, &msg)); + if (msg) fputs (msg, stderr); + query = notmuch_query_create(rw_db, ""); EXPECT0 (notmuch_query_search_messages (query, &messages)); diff --git a/test/T720-lib-lifetime.sh b/test/T720-lib-lifetime.sh index 3d94d4df..e5afeaa2 100755 --- a/test/T720-lib-lifetime.sh +++ b/test/T720-lib-lifetime.sh @@ -23,7 +23,13 @@ int main (int argc, char** argv) { notmuch_database_t *db; notmuch_status_t stat; - stat = notmuch_database_open (argv[1], NOTMUCH_DATABASE_MODE_READ_ONLY, &db); + char* msg = NULL; + + stat = notmuch_database_open_with_config (argv[1], + NOTMUCH_DATABASE_MODE_READ_ONLY, + "", NULL, &db, &msg); + if (msg) fputs (msg, stderr); + if (stat != NOTMUCH_STATUS_SUCCESS) { fprintf (stderr, "error opening database: %d\n", stat); exit (1); -- 2.35.2