diff options
author | Austin Clements <amdragon@MIT.EDU> | 2012-05-18 00:13:41 -0400 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2012-05-23 22:32:02 -0300 |
commit | 54508eb78d1c5c1c67c8b220cf2bd826af1203a9 (patch) | |
tree | d0f29997de91e18ed40059f2bf5b187cd3548eec | |
parent | cdd698f96976dc8fc43efd19c452d0fca48e2618 (diff) |
python: Remove find_message_by_filename workaround
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.
-rw-r--r-- | bindings/python/notmuch/database.py | 9 | ||||
-rwxr-xr-x | 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 ff89818b..e5c74cfb 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 6018c2d0..3f03a2e3 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 <<EOF +import notmuch +db = notmuch.Database(mode=notmuch.Database.MODE.READ_ONLY) +print db.find_message_by_filename("i-dont-exist") +EOF +test_expect_equal "$(cat OUTPUT)" "None" + test_done |