The previous (pre-0.34.2) constructor searched for a config file but
only if the database path was not specified, and only to retrieve
database.path. Neither of the available options (CONFIG.SEARCH or
CONFIG.NONE) matches this semantics exactly, but CONFIG.SEARCH causes
less breakage for people who relied on the old behaviour to set their
database.path [1]. Since it also seems like the friendlier option in
the long run, this commit switches to CONFIG.SEARCH as default.
This requires a certain amount of updating the pytest tests, but most
users will actually have a config file, unlike the test environment.
[1]: id:87fsqijx7u@metapensiero.it
---
bindings/python-cffi/notmuch2/_database.py | 2 +-
bindings/python-cffi/tests/test_config.py | 4 ++--
bindings/python-cffi/tests/test_database.py | 4 ++--
bindings/python-cffi/tests/test_tags.py | 15 +--
bindings/python-cffi/tests/test_thread.py | 2 +-
5 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/bindings/python-cffi/notmuch2/_database.py
b/bindings/python-cffi/notmuch2/_database.py
index 14a8f15c..d7485b4d 100644
--- a/bindings/python-cffi/notmuch2/_database.py
+++ b/bindings/python-cffi/notmuch2/_database.py
@@ -139,7 +139,7 @@ class Database(base.NotmuchObject):
path = os.fsencode(path)
return path
-def __init__(self, path=None, mode=MODE.READ_ONLY, config=CONFIG.EMPTY):
+def __init__(self, path=None, mode=MODE.READ_ONLY, config=CONFIG.SEARCH):
if isinstance(mode, str):
mode = self.STR_MODE_MAP[mode]
self.mode = mode
diff --git a/bindings/python-cffi/tests/test_config.py
b/bindings/python-cffi/tests/test_config.py
index 1b2695f5..67b0dea4 100644
--- a/bindings/python-cffi/tests/test_config.py
+++ b/bindings/python-cffi/tests/test_config.py
@@ -23,9 +23,9 @@ class TestIter:
def test_set_get(self, maildir):
# Ensure get-set works from different db objects
-with dbmod.Database.create(maildir.path) as db0:
+with dbmod.Database.create(maildir.path,
config=dbmod.Database.CONFIG.EMPTY) as db0:
db0.config['spam'] = 'ham'
-with dbmod.Database(maildir.path) as db1:
+with dbmod.Database(maildir.path, config=dbmod.Database.CONFIG.EMPTY)
as db1:
assert db1.config['spam'] == 'ham'
def test_get_keyerror(self, db):
diff --git a/bindings/python-cffi/tests/test_database.py
b/bindings/python-cffi/tests/test_database.py
index 9b3219c0..f1d12ea6 100644
--- a/bindings/python-cffi/tests/test_database.py
+++ b/bindings/python-cffi/tests/test_database.py
@@ -13,7 +13,7 @@ import notmuch2._message as message
@pytest.fixture
def db(maildir):
-with dbmod.Database.create(maildir.path) as db:
+with dbmod.Database.create(maildir.path,
config=notmuch2.Database.CONFIG.EMPTY) as db:
yield db
@@ -293,7 +293,7 @@ class TestQuery:
maildir.deliver(body='baz',
headers=[('In-Reply-To', '<{}>'.format(msgid))])
notmuch('new')
-with dbmod.Database(maildir.path, 'rw') as db:
+with dbmod.Database(maildir.path, 'rw',
config=notmuch2.Database.CONFIG.EMPTY) as db:
yield db
def test_count_messages(self, db):
diff --git a/bindings/python-cffi/tests/test_tags.py
b/bindings/python-cffi/tests/test_tags.py
index faf3947b..f2c6209d 100644
--- a/bindings/python-cffi/tests/test_tags.py
+++ b/bindings/python-cffi/tests/test_tags.py
@@ -23,7 +23,7 @@ class TestImmutable:
"""
maildir.deliver()
notmuch('new')
-with database.Database(maildir.path) as db:
+with database.Database(maildir.path,
config=database.Database.CONFIG.EMPTY) as db:
yield db.tags
def test_type(self, tagset):
@@ -33,7 +33,7 @@ class TestImmutable:
def test_hash(self, tagset, maildir, notmuch):
h0 = hash(tagset)
notmuch('tag', '+foo', '*')
-with database.Database(maildir.path) as db:
+with database.Database(maildir.path,
config=database.Database.CONFIG.EMPTY) as db:
h1 = hash(db.tags)
assert h0 != h1
@@ -42,7 +42,7 @@ class TestImmutable:
def test_neq(self, tagset, maildir, notmuch):
notmuch('tag', '+foo', '*')
-with database.Database(maildir.path) as db:
+with database.Database(maildir.path,
config=database.Database.CONFIG.EMPTY) as db:
assert tagset != db.tags
def test_contains(self, tagset):
@@ -159,7 +159,8 @@ class TestMutableTagset:
_, pathname = maildir.deliver()
notmuch('new')
with database.Database(maildir.path,
- mode=database.Mode.READ_WRITE) as db:
+ mode=database.Mode.READ_WRITE,
+ config=database.Database.CONFIG.EMPTY) as db:
msg = db.get(pathname)
yield msg.tags
@@ -195,7 +196,8 @@ class TestMutableTagset:
