1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/742aac57ec94/ changeset: 742aac57ec94 user: greg date: 2012-12-14 16:59:53 summary: Don't munge the Galaxy root's tool_data_table_conf.sml file or the shed_tool_data_table_conf.xml file when running tool shed functional tests. affected #: 1 file diff -r a749bcb137928ede156899ca5ef4d2eef6e9f45c -r 742aac57ec941aa89ac7ca07548bf531127bc31b test/tool_shed/functional_tests.py --- a/test/tool_shed/functional_tests.py +++ b/test/tool_shed/functional_tests.py @@ -68,6 +68,11 @@ </toolbox> ''' +tool_data_table_conf_xml_template = '''<?xml version="1.0"?> +<tables> +</tables> +''' + def run_tests( test_config ): loader = nose.loader.TestLoader( config=test_config ) plug_loader = test_config.plugins.prepareTestLoader( loader ) @@ -95,14 +100,8 @@ if not os.path.isabs( tool_shed_test_file_dir ): tool_shed_test_file_dir = tool_shed_test_file_dir ignore_files = () - if os.path.exists( 'tool_data_table_conf.test.xml' ): - tool_data_table_config_path = 'tool_data_table_conf.test.xml' - else: - tool_data_table_config_path = 'tool_data_table_conf.xml' - shed_tool_data_table_config = 'shed_tool_data_table_conf.xml' tool_dependency_dir = os.environ.get( 'TOOL_SHED_TOOL_DEPENDENCY_DIR', None ) use_distributed_object_store = os.environ.get( 'TOOL_SHED_USE_DISTRIBUTED_OBJECT_STORE', False ) - if not os.path.isdir( tool_shed_test_tmp_dir ): os.mkdir( tool_shed_test_tmp_dir ) tool_shed_test_proxy_port = None @@ -112,6 +111,8 @@ else: tempdir = tempfile.mkdtemp( dir=tool_shed_test_tmp_dir ) shed_db_path = os.path.join( tempdir, 'database' ) + shed_tool_data_table_conf_file = os.environ.get( 'TOOL_SHED_TEST_TOOL_DATA_TABLE_CONF', os.path.join( tool_shed_test_tmp_dir, 'shed_tool_data_table_conf.xml' ) ) + galaxy_tool_data_table_conf_file = os.environ.get( 'GALAXY_TEST_TOOL_DATA_TABLE_CONF', os.path.join( tool_shed_test_tmp_dir, 'tool_data_table_conf.xml' ) ) galaxy_shed_tool_conf_file = os.environ.get( 'GALAXY_TEST_TOOL_CONF', os.path.join( tool_shed_test_tmp_dir, 'test_tool_conf.xml' ) ) galaxy_tool_sheds_conf_file = os.environ.get( 'GALAXY_TEST_SHED_TOOLS_CONF', os.path.join( tool_shed_test_tmp_dir, 'test_sheds_conf.xml' ) ) if 'GALAXY_TEST_DBPATH' in os.environ: @@ -148,6 +149,11 @@ print "Directory location for hgweb.config:", hgweb_config_dir + # Generate the tool_data_table_conf.xml file. + file( galaxy_tool_data_table_conf_file, 'w' ).write( tool_data_table_conf_xml_template ) + # Generate the shed_tool_data_table_conf.xml file. + file( shed_tool_data_table_conf_file, 'w' ).write( tool_data_table_conf_xml_template ) + # ---- Build Tool Shed Application -------------------------------------------------- toolshedapp = None global_conf = { '__file__' : 'community_wsgi.ini.sample' } @@ -169,8 +175,8 @@ tool_path=tool_path, datatype_converters_config_file = 'datatype_converters_conf.xml.sample', tool_parse_help = False, - tool_data_table_config_path = tool_data_table_config_path, - shed_tool_data_table_config = shed_tool_data_table_config, + tool_data_table_config_path = galaxy_tool_data_table_conf_file, + shed_tool_data_table_config = shed_tool_data_table_conf_file, log_destination = "stdout", use_heartbeat = False, allow_user_creation = True, @@ -225,10 +231,11 @@ # ---- Optionally start up a Galaxy instance ------------------------------------------------------ if 'TOOL_SHED_TEST_OMIT_GALAXY' not in os.environ: - # Generate the shed_tool_conf.xml and tool_sheds_conf.xml files + # Generate the shed_tool_conf.xml file. tool_sheds_conf_template_parser = string.Template( tool_sheds_conf_xml_template ) tool_sheds_conf_xml = tool_sheds_conf_template_parser.safe_substitute( shed_url=tool_shed_test_host, shed_port=tool_shed_test_port ) file( galaxy_tool_sheds_conf_file, 'w' ).write( tool_sheds_conf_xml ) + # Generate the tool_sheds_conf.xml file. shed_tool_conf_template_parser = string.Template( shed_tool_conf_xml_template ) shed_tool_conf_xml = shed_tool_conf_template_parser.safe_substitute( shed_tool_path=galaxy_shed_tool_path ) file( galaxy_shed_tool_conf_file, 'w' ).write( shed_tool_conf_xml ) @@ -251,8 +258,8 @@ tool_sheds_config_file = galaxy_tool_sheds_conf_file, datatype_converters_config_file = "datatype_converters_conf.xml.sample", tool_parse_help = False, - tool_data_table_config_path = tool_data_table_config_path, - shed_tool_data_table_config = shed_tool_data_table_config, + tool_data_table_config_path = galaxy_tool_data_table_conf_file, + shed_tool_data_table_config = shed_tool_data_table_conf_file, log_destination = "stdout", use_heartbeat = False, allow_user_creation = True, 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.