From cb35ee5e205e8379ec91a092d7eacea9aeca075b Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Fri, 24 Aug 2012 16:47:56 +0200
Subject: [PATCH] Fix tests
---
xbob/db/replay/create.py | 7 +++----
xbob/db/replay/query.py | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/xbob/db/replay/create.py b/xbob/db/replay/create.py
index a275a1b..ef31716 100644
--- a/xbob/db/replay/create.py
+++ b/xbob/db/replay/create.py
@@ -158,8 +158,7 @@ def create_tables(args):
from bob.db.utils import connection_string
from sqlalchemy import create_engine
- engine = create_engine(connection_string(args.type, args.location,
- args.files[0]), echo=args.verbose)
+ engine = create_engine(connection_string(args.type, args.files[0]), echo=args.verbose)
Client.metadata.create_all(engine)
RealAccess.metadata.create_all(engine)
Attack.metadata.create_all(engine)
@@ -173,7 +172,7 @@ def create(args):
from bob.db.utils import session
- dbfile = os.path.join(args.location, args.files[0])
+ dbfile = args.files[0]
args.verbose = 0 if args.verbose is None else sum(args.verbose)
@@ -187,7 +186,7 @@ def create(args):
# the real work...
create_tables(args)
- s = session(args.type, args.location, args.files[0], echo=(args.verbose >= 2))
+ s = session(args.type, args.files[0], echo=(args.verbose >= 2))
add_clients(s, args.protodir, args.verbose)
add_real_lists(s, args.protodir, args.verbose)
add_attack_lists(s, args.protodir, args.verbose)
diff --git a/xbob/db/replay/query.py b/xbob/db/replay/query.py
index 3656d07..ceadfc2 100644
--- a/xbob/db/replay/query.py
+++ b/xbob/db/replay/query.py
@@ -34,7 +34,7 @@ class Database(object):
self.session = None
else:
- self.session = utils.session(INFO.type(), INFO.location(), INFO.files()[0])
+ self.session = utils.session(INFO.type(), INFO.files()[0])
def is_valid(self):
"""Returns if a valid session has been opened for reading the database"""
--
GitLab