Skip to content
Snippets Groups Projects
Commit cb35ee5e authored by André Anjos's avatar André Anjos :speech_balloon:
Browse files

Fix tests

parent e48faf04
No related branches found
No related tags found
No related merge requests found
...@@ -158,8 +158,7 @@ def create_tables(args): ...@@ -158,8 +158,7 @@ def create_tables(args):
from bob.db.utils import connection_string from bob.db.utils import connection_string
from sqlalchemy import create_engine from sqlalchemy import create_engine
engine = create_engine(connection_string(args.type, args.location, engine = create_engine(connection_string(args.type, args.files[0]), echo=args.verbose)
args.files[0]), echo=args.verbose)
Client.metadata.create_all(engine) Client.metadata.create_all(engine)
RealAccess.metadata.create_all(engine) RealAccess.metadata.create_all(engine)
Attack.metadata.create_all(engine) Attack.metadata.create_all(engine)
...@@ -173,7 +172,7 @@ def create(args): ...@@ -173,7 +172,7 @@ def create(args):
from bob.db.utils import session 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) args.verbose = 0 if args.verbose is None else sum(args.verbose)
...@@ -187,7 +186,7 @@ def create(args): ...@@ -187,7 +186,7 @@ def create(args):
# the real work... # the real work...
create_tables(args) 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_clients(s, args.protodir, args.verbose)
add_real_lists(s, args.protodir, args.verbose) add_real_lists(s, args.protodir, args.verbose)
add_attack_lists(s, args.protodir, args.verbose) add_attack_lists(s, args.protodir, args.verbose)
......
...@@ -34,7 +34,7 @@ class Database(object): ...@@ -34,7 +34,7 @@ class Database(object):
self.session = None self.session = None
else: 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): def is_valid(self):
"""Returns if a valid session has been opened for reading the database""" """Returns if a valid session has been opened for reading the database"""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment