From: Floris Bruynooghe <flub@devork.be>
To: notmuch@notmuchmail.org
Subject: [PATCH 2/2] python config access: fix style and KeyError bug
Date: Mon, 15 Jun 2020 23:55:53 +0200 [thread overview]
Message-ID: <20200615215553.220529-3-flub@devork.be> (raw)
In-Reply-To: <20200615215553.220529-1-flub@devork.be>
This fixes some minor style/pep8 things and adds tests for the new
config support. Also fixes a bug where KeyError was never raised
on a missing key.
---
bindings/python-cffi/notmuch2/_config.py | 9 ++--
bindings/python-cffi/tests/test_config.py | 56 +++++++++++++++++++++++
2 files changed, 62 insertions(+), 3 deletions(-)
create mode 100644 bindings/python-cffi/tests/test_config.py
diff --git a/bindings/python-cffi/notmuch2/_config.py b/bindings/python-cffi/notmuch2/_config.py
index 58383c16..29de6495 100644
--- a/bindings/python-cffi/notmuch2/_config.py
+++ b/bindings/python-cffi/notmuch2/_config.py
@@ -4,9 +4,12 @@ import notmuch2._base as base
import notmuch2._capi as capi
import notmuch2._errors as errors
+
__all__ = ['ConfigMapping']
+
class ConfigIter(base.NotmuchIter):
+
def __init__(self, parent, iter_p):
super().__init__(
parent, iter_p,
@@ -19,6 +22,7 @@ class ConfigIter(base.NotmuchIter):
item = super().__next__()
return base.BinString.from_cffi(item)
+
class ConfigMapping(base.NotmuchObject, collections.abc.MutableMapping):
"""The config key/value pairs stored in the database.
@@ -50,11 +54,10 @@ class ConfigMapping(base.NotmuchObject, collections.abc.MutableMapping):
ret = capi.lib.notmuch_database_get_config(self._ptr(), key, val_pp)
if ret != capi.lib.NOTMUCH_STATUS_SUCCESS:
raise errors.NotmuchError(ret)
- if val_pp[0] == "":
- capi.lib.free(val_pp[0])
- raise KeyError
val = base.BinString.from_cffi(val_pp[0])
capi.lib.free(val_pp[0])
+ if val == '':
+ raise KeyError
return val
def __setitem__(self, key, val):
diff --git a/bindings/python-cffi/tests/test_config.py b/bindings/python-cffi/tests/test_config.py
new file mode 100644
index 00000000..1b2695f5
--- /dev/null
+++ b/bindings/python-cffi/tests/test_config.py
@@ -0,0 +1,56 @@
+import collections.abc
+
+import pytest
+
+import notmuch2._database as dbmod
+
+import notmuch2._config as config
+
+
+class TestIter:
+
+ @pytest.fixture
+ def db(self, maildir):
+ with dbmod.Database.create(maildir.path) as db:
+ yield db
+
+ def test_type(self, db):
+ assert isinstance(db.config, collections.abc.MutableMapping)
+ assert isinstance(db.config, config.ConfigMapping)
+
+ def test_alive(self, db):
+ assert db.config.alive
+
+ def test_set_get(self, maildir):
+ # Ensure get-set works from different db objects
+ with dbmod.Database.create(maildir.path) as db0:
+ db0.config['spam'] = 'ham'
+ with dbmod.Database(maildir.path) as db1:
+ assert db1.config['spam'] == 'ham'
+
+ def test_get_keyerror(self, db):
+ with pytest.raises(KeyError):
+ val = db.config['not-a-key']
+ print(repr(val))
+
+ def test_iter(self, db):
+ assert list(db.config) == []
+ db.config['spam'] = 'ham'
+ db.config['eggs'] = 'bacon'
+ assert set(db.config) == {'spam', 'eggs'}
+ assert set(db.config.keys()) == {'spam', 'eggs'}
+ assert set(db.config.values()) == {'ham', 'bacon'}
+ assert set(db.config.items()) == {('spam', 'ham'), ('eggs', 'bacon')}
+
+ def test_len(self, db):
+ assert len(db.config) == 0
+ db.config['spam'] = 'ham'
+ assert len(db.config) == 1
+ db.config['eggs'] = 'bacon'
+ assert len(db.config) == 2
+
+ def test_del(self, db):
+ db.config['spam'] = 'ham'
+ assert db.config.get('spam') == 'ham'
+ del db.config['spam']
+ assert db.config.get('spam') is None
--
2.27.0
next prev parent reply other threads:[~2020-06-15 21:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-15 21:55 python: config API Floris Bruynooghe
2020-06-15 21:55 ` [PATCH 1/2] python/notmuch2: add bindings for the database config strings Floris Bruynooghe
2020-06-15 21:55 ` Floris Bruynooghe [this message]
2020-06-16 0:59 ` python: config API David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200615215553.220529-3-flub@devork.be \
--to=flub@devork.be \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).