Switch to unified view

a/Allura/allura/websetup/bootstrap.py b/Allura/allura/websetup/bootstrap.py
...
...
18
from ming.orm.ormsession import ThreadLocalORMSession
18
from ming.orm.ormsession import ThreadLocalORMSession
19
19
20
import allura
20
import allura
21
from allura.lib import plugin
21
from allura.lib import plugin
22
from allura import model as M
22
from allura import model as M
23
from allura.websetup import schema
23
from allura.command import EnsureIndexCommand
24
from allura.command import EnsureIndexCommand
24
25
25
log = logging.getLogger(__name__)
26
log = logging.getLogger(__name__)
26
27
27
def set_flyway_info():
28
def set_flyway_info():
...
...
59
    # Clean up all old stuff
60
    # Clean up all old stuff
60
    ThreadLocalORMSession.close_all()
61
    ThreadLocalORMSession.close_all()
61
    c.queued_messages = defaultdict(list)
62
    c.queued_messages = defaultdict(list)
62
    c.user = c.project = c.app = None
63
    c.user = c.project = c.app = None
63
    database=conf.get('db_prefix', '') + 'project:test'
64
    database=conf.get('db_prefix', '') + 'project:test'
64
    g._push_object(allura.lib.app_globals.Globals())
65
    wipe_database()
65
    wipe_database()
66
    try:
66
    try:
67
        g.solr.delete(q='*:*')
67
        g.solr.delete(q='*:*')
68
    except: # pragma no cover
68
    except: # pragma no cover
69
        log.error('SOLR server is %s', g.solr_server)
69
        log.error('SOLR server is %s', g.solr_server)
...
...
192
        ThreadLocalORMSession.flush_all()
192
        ThreadLocalORMSession.flush_all()
193
        g.send_all_messages()
193
        g.send_all_messages()
194
        ThreadLocalORMSession.flush_all()
194
        ThreadLocalORMSession.flush_all()
195
        ThreadLocalORMSession.close_all()
195
        ThreadLocalORMSession.close_all()
196
196
197
198
def wipe_database():
197
def wipe_database():
199
    conn = M.main_doc_session.bind.conn
198
    conn = M.main_doc_session.bind.conn
200
    flyway = MigrateCommand('flyway')
199
    flyway = MigrateCommand('flyway')
201
    index = EnsureIndexCommand('ensure_index')
200
    index = EnsureIndexCommand('ensure_index')
202
    if isinstance(conn, mim.Connection):
201
    if isinstance(conn, mim.Connection):