opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-13 00:44:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the install database connection specification for the install and test framework.

Browse Source
This commit is contained in:
Dave Bouvier
2014-02-21 16:05:53 -05:00
parent 11eb55edff
commit a9210d976f
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py
+7 -2
View File
@@ -66,6 +66,11 @@ default_galaxy_locales = 'en'
default_galaxy_test_file_dir = "test-data"
os.environ[ 'GALAXY_INSTALL_TEST_TMP_DIR' ] = galaxy_test_tmp_dir
# Use separate databases for Galaxy and tool shed install info by default,
# set GALAXY_TEST_INSTALL_DB_MERGED to True to revert to merged databases
# behavior.
default_install_db_merged = False
# This script can be run in such a way that no Tool Shed database records should be changed.
if '-info_only' in sys.argv or 'GALAXY_INSTALL_TEST_INFO_ONLY' in os.environ:
can_update_tool_shed = False
@@ -421,9 +426,9 @@ def main():
if 'GALAXY_INSTALL_TEST_INSTALL_DBURI' in os.environ:
install_database_connection = os.environ[ 'GALAXY_INSTALL_TEST_INSTALL_DBURI' ]
elif asbool( os.environ.get( 'GALAXY_TEST_INSTALL_DB_MERGED', default_install_db_merged ) ):
install_database_connection = galaxy_database_connection
install_database_connection = database_connection
else:
install_db_path = os.path.join( galaxy_db_path, 'install.sqlite' )
install_galaxy_db_path = os.path.join( galaxy_db_path, 'install.sqlite' )
install_database_connection = 'sqlite:///%s' % install_galaxy_db_path
kwargs = {}
for dir in [ galaxy_test_tmp_dir ]:
test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py
+7 -2
View File
@@ -65,6 +65,11 @@ default_galaxy_locales = 'en'
default_galaxy_test_file_dir = "test-data"
os.environ[ 'GALAXY_INSTALL_TEST_TMP_DIR' ] = galaxy_test_tmp_dir
# Use separate databases for Galaxy and tool shed install info by default,
# set GALAXY_TEST_INSTALL_DB_MERGED to True to revert to merged databases
# behavior.
default_install_db_merged = False
# This script can be run in such a way that no Tool Shed database records should be changed.
if '-info_only' in sys.argv or 'GALAXY_INSTALL_TEST_INFO_ONLY' in os.environ:
can_update_tool_shed = False
@@ -273,9 +278,9 @@ def main():
if 'GALAXY_INSTALL_TEST_INSTALL_DBURI' in os.environ:
install_database_connection = os.environ[ 'GALAXY_INSTALL_TEST_INSTALL_DBURI' ]
elif asbool( os.environ.get( 'GALAXY_TEST_INSTALL_DB_MERGED', default_install_db_merged ) ):
install_database_connection = galaxy_database_connection
install_database_connection = database_connection
else:
install_db_path = os.path.join( galaxy_db_path, 'install.sqlite' )
install_galaxy_db_path = os.path.join( galaxy_db_path, 'install.sqlite' )
install_database_connection = 'sqlite:///%s' % install_galaxy_db_path
kwargs = {}
for dir in [ galaxy_test_tmp_dir ]: