1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/1beac989dac9/ Changeset: 1beac989dac9 User: davebgx Date: 2014-02-21 22:05:53 Summary: Fix the install database connection specification for the install and test framework. Affected #: 2 files diff -r 0a35b28844159fd534e49bbb71c0ab00c4dfb367 -r 1beac989dac959139f421353a5f33f53c1e78d96 test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py --- a/test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py +++ b/test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py @@ -66,6 +66,11 @@ 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 @@ 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 ]: diff -r 0a35b28844159fd534e49bbb71c0ab00c4dfb367 -r 1beac989dac959139f421353a5f33f53c1e78d96 test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py --- a/test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py +++ b/test/install_and_test_tool_shed_repositories/tool_dependency_definitions/functional_tests.py @@ -65,6 +65,11 @@ 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 @@ 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 ]: Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.