Skip to content

Commit 8127fcf

Browse files
committed
pytest: don't add bookeeper-db option if bookkeeper is disabled.
There are other ways we can disable it, of course (e.g full path name) but this is the most obvious. Signed-off-by: Rusty Russell <[email protected]>
1 parent 989cf17 commit 8127fcf

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

tests/fixtures.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ def __init__(self, *args, **kwargs):
4848
self.daemon.opts['plugin={}'.format(dblog)] = None
4949
self.daemon.opts['dblog-file'] = 'dblog.sqlite3'
5050

51-
# FIXME: make sure bookkeeper is not disabled
52-
if db_type == 'postgres':
51+
if db_type == 'postgres' and ('disable-plugin', 'bookkeeper') not in self.daemon.opts.items():
5352
accts_db = self.db.provider.get_db('', 'accounts', 0)
5453
self.daemon.opts['bookkeeper-db'] = accts_db.get_dsn()
5554

0 commit comments

Comments
 (0)