Commit 44ad4b80 authored by Grégory Wisniewski's avatar Grégory Wisniewski

Handle only MySQL database for now and explicitely use it in functionnal tests.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@1386 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent cb0dc7ec
...@@ -18,11 +18,9 @@ ...@@ -18,11 +18,9 @@
from neo.exception import DatabaseFailure from neo.exception import DatabaseFailure
from neo.storage.database.manager import DatabaseManager from neo.storage.database.manager import DatabaseManager
from neo.storage.database.mysqldb import MySQLDatabaseManager from neo.storage.database.mysqldb import MySQLDatabaseManager
from neo.storage.database.sqlite import SQLiteManager
DATABASE_MANAGER_DICT = { DATABASE_MANAGER_DICT = {
'MySQL': mysqldb.MySQLDatabaseManager, 'MySQL': MySQLDatabaseManager,
'SQLite': sqlite.SQLiteManager,
} }
def buildDatabaseManager(name, config): def buildDatabaseManager(name, config):
......
...@@ -129,7 +129,7 @@ class NEOCluster(object): ...@@ -129,7 +129,7 @@ class NEOCluster(object):
db_user='neo', db_password='neo', db_user='neo', db_password='neo',
db_super_user='root', db_super_password=None, db_super_user='root', db_super_password=None,
cleanup_on_delete=False, temp_dir=None, cleanup_on_delete=False, temp_dir=None,
clear_databases=True): clear_databases=True, adapter='MySQL'):
self.cleanup_on_delete = cleanup_on_delete self.cleanup_on_delete = cleanup_on_delete
self.uuid_set = set() self.uuid_set = set()
self.db_super_user = db_super_user self.db_super_user = db_super_user
...@@ -175,6 +175,7 @@ class NEOCluster(object): ...@@ -175,6 +175,7 @@ class NEOCluster(object):
'--bind': '127.0.0.1:%d' % (port, ), '--bind': '127.0.0.1:%d' % (port, ),
'--masters': self.master_nodes, '--masters': self.master_nodes,
'--database': '%s:%s@%s' % (db_user, db_password, db), '--database': '%s:%s@%s' % (db_user, db_password, db),
'--adapter': adapter,
}) })
# create neoctl # create neoctl
self.neoctl = NeoCTL('127.0.0.1', admin_port, self.neoctl = NeoCTL('127.0.0.1', admin_port,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment