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 <rusty@rustcorp.com.au>

Author: rustyrussell

tests/fixtures.py

@@ -48,8 +48,7 @@ def __init__(self, *args, **kwargs):
                 self.daemon.opts['plugin={}'.format(dblog)] = None
                 self.daemon.opts['dblog-file'] = 'dblog.sqlite3'
 
-        # FIXME: make sure bookkeeper is not disabled
-        if db_type == 'postgres':
+        if db_type == 'postgres' and ('disable-plugin', 'bookkeeper') not in self.daemon.opts.items():
             accts_db = self.db.provider.get_db('', 'accounts', 0)
             self.daemon.opts['bookkeeper-db'] = accts_db.get_dsn()