Switch to unified view

a/AlluraTesting/alluratest/controller.py b/AlluraTesting/alluratest/controller.py
...
...
42
        conf_dir = os.getcwd()
42
        conf_dir = os.getcwd()
43
    ew.TemplateEngine.initialize({})
43
    ew.TemplateEngine.initialize({})
44
    test_file = os.path.join(conf_dir, get_config_file(config))
44
    test_file = os.path.join(conf_dir, get_config_file(config))
45
    cmd = SetupCommand('setup-app')
45
    cmd = SetupCommand('setup-app')
46
    cmd.run([test_file])
46
    cmd.run([test_file])
47
    while M.MonQTask.run_ready('setup'):
48
        ThreadLocalORMSession.flush_all()
47
49
48
def setup_functional_test(config=None, app_name=DFL_APP_NAME):
50
def setup_functional_test(config=None, app_name=DFL_APP_NAME):
49
    '''Create clean environment for running tests.  Also return WSGI test app'''
51
    '''Create clean environment for running tests.  Also return WSGI test app'''
50
    config = get_config_file(config)
52
    config = get_config_file(config)
51
    setup_basic_test(config, app_name)
53
    setup_basic_test(config, app_name)