From 6ead65d3a1982e9a22fb671a05f19da2f8e63934 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Sat, 19 May 2012 00:13:41 +2000 Subject: [PATCH] [PATCH 8/9] python: Remove find_message_by_filename workaround --- 3c/7053128c8e0690677c69f72cff1e36acc4c556 | 126 ++++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 3c/7053128c8e0690677c69f72cff1e36acc4c556 diff --git a/3c/7053128c8e0690677c69f72cff1e36acc4c556 b/3c/7053128c8e0690677c69f72cff1e36acc4c556 new file mode 100644 index 000000000..b685dbc3d --- /dev/null +++ b/3c/7053128c8e0690677c69f72cff1e36acc4c556 @@ -0,0 +1,126 @@ +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 542DE429E36 + for ; Thu, 17 May 2012 21:13:59 -0700 (PDT) +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 ozEnhleAt8Jo for ; + Thu, 17 May 2012 21:13:58 -0700 (PDT) +Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU + [18.9.25.12]) + by olra.theworths.org (Postfix) with ESMTP id 72D8B431E84 + for ; Thu, 17 May 2012 21:13:53 -0700 (PDT) +X-AuditID: 1209190c-b7fad6d000000920-fe-4fb5cc80b727 +Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) + by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP + id 08.1D.02336.08CC5BF4; Fri, 18 May 2012 00:13:52 -0400 (EDT) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q4I4DqXm029946; + Fri, 18 May 2012 00:13:52 -0400 +Received: from drake.mit.edu + (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [209.6.116.242]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q4I4DpO9026793 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Fri, 18 May 2012 00:13:52 -0400 (EDT) +Received: from amthrax by drake.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1SVEZb-0000zI-1z; Fri, 18 May 2012 00:13:51 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH 8/9] python: Remove find_message_by_filename workaround +Date: Fri, 18 May 2012 00:13:41 -0400 +Message-Id: <1337314423-3702-9-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10 +In-Reply-To: <1337314423-3702-1-git-send-email-amdragon@mit.edu> +References: <1337314423-3702-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFlrPIsWRmVeSWpSXmKPExsUixCmqrNtwZqu/wadzphbXb85kdmD0eLbq + FnMAYxSXTUpqTmZZapG+XQJXRkNfC0vBYoGKKcs+szUwzubpYuTgkBAwkZh9KK6LkRPIFJO4 + cG89WxcjF4eQwD5GiYv/TzBCOBsYJdrWb2EBqRISuM8kcX5NKIQ9i1Hi/qxCEJtNQENi2/7l + jCC2iIC0xM67s1lBFjALqEn86VIBCQsLuEt8ePCADcRmEVCVaNw4mxnE5hWwl1g97SwbxBHy + Ek/v97GBtHIKOEhMOx4Nscle4t+FZpYJjPwLGBlWMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Rrq + 5WaW6KWmlG5iBIeLJM8OxjcHlQ4xCnAwKvHw7piz1V+INbGsuDL3EKMkB5OSKO/3k0AhvqT8 + lMqMxOKM+KLSnNTiQ4wSHMxKIryy3UA53pTEyqrUonyYlDQHi5I4r4rWOz8hgfTEktTs1NSC + 1CKYrAwHh5IE79vTQI2CRanpqRVpmTklCGkmDk6Q4Twgw8+ADC8uSMwtzkyHyJ9iVJQS5/0B + 0iwAksgozYPrhcXzK0ZxoFeEeTlA2nmAqQCu+xXQYCagwWW5m0AGlyQipKQaGHseSJWetrN/ + c+LrGmZZLu2dH79u3ft0H38bn+OLgAzNQtNHTQe83nte5ln/yOb5IiPWQImLn4IXvQ413fpA + cuc5lt7eaXdNe64vP8t8/vL0uiP6BX3pN+dXX7xS/UI0eeq9gHr906uf9N7b16R0oeaW4Y4f + pw1CPrX+9jSc8YV/1qJlHx3VmW2VWIozEg21mIuKEwFw+V1+wgIAAA== +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: Fri, 18 May 2012 04:13:59 -0000 + +Now that notmuch_database_find_message_by_filename works on read-only +databases, remove the workaround that disabled it on read-write +databases. + +This also adds a regression test for find_message_by_filename. +--- + bindings/python/notmuch/database.py | 9 --------- + test/python | 8 ++++++++ + 2 files changed, 8 insertions(+), 9 deletions(-) + +diff --git a/bindings/python/notmuch/database.py b/bindings/python/notmuch/database.py +index ff89818..e5c74cf 100644 +--- a/bindings/python/notmuch/database.py ++++ b/bindings/python/notmuch/database.py +@@ -526,19 +526,10 @@ class Database(object): + retry. + :raises: :exc:`NotInitializedError` if the database was not + intitialized. +- :raises: :exc:`ReadOnlyDatabaseError` if the database has not been +- opened in read-write mode + + *Added in notmuch 0.9*""" + self._assert_db_is_initialized() + +- # work around libnotmuch calling exit(3), see +- # id:20120221002921.8534.57091@thinkbox.jade-hamburg.de +- # TODO: remove once this issue is resolved +- if self.mode != Database.MODE.READ_WRITE: +- raise ReadOnlyDatabaseError('The database has to be opened in ' +- 'read-write mode for get_directory') +- + msg_p = NotmuchMessageP() + status = Database._find_message_by_filename(self._db, _str(filename), + byref(msg_p)) +diff --git a/test/python b/test/python +index 6018c2d..3f03a2e 100755 +--- a/test/python ++++ b/test/python +@@ -28,4 +28,12 @@ EOF + notmuch search --sort=oldest-first --output=messages tag:inbox | sed s/^id:// > EXPECTED + test_expect_equal_file OUTPUT EXPECTED + ++test_begin_subtest "get non-existent file" ++test_python <