From 99f951108ee8a11e8cdccccfd7d2656a54a5378e Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Thu, 14 May 2026 14:43:36 -0400 Subject: [PATCH] Revert test_1010 to assert positive data-table registration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Toolshed tests caught test_0025_verify_sample_files still asserting the old "non-DM repos skip data-table registration" behavior. The design pivot reverted that — non-DM repos now register tables — so the test goes back to its original positive assertion and the unused verify_no_installed_repository_data_table_entries helper is removed. Co-Authored-By: Claude Opus 4.7 --- lib/tool_shed/test/base/testcase.py | 12 ------------ ...1010_install_repository_with_tool_dependencies.py | 6 ++---- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/lib/tool_shed/test/base/testcase.py b/lib/tool_shed/test/base/testcase.py index b945f4db3b5..f485e711fe1 100644 --- a/lib/tool_shed/test/base/testcase.py +++ b/lib/tool_shed/test/base/testcase.py @@ -1655,18 +1655,6 @@ class ShedTestCase(ShedApiTestCase): assert self._installation_client self._installation_client.refresh_tool_shed_repository(repo) - def verify_no_installed_repository_data_table_entries(self, table_names): - """Assert that none of ``table_names`` appears in shed_tool_data_table_conf.xml.""" - shed_tool_data_table_conf = self.shed_tool_data_table_conf - if not os.path.exists(shed_tool_data_table_conf): - return - data_tables, error_message = xml_util.parse_xml(shed_tool_data_table_conf) - assert not error_message, f"Failed to parse {shed_tool_data_table_conf}: {error_message}" - assert data_tables is not None - registered_names = {t.get("name") for t in data_tables.findall("table")} - for name in table_names: - assert name not in registered_names, f"Unexpected data table entry '{name}' in {shed_tool_data_table_conf}" - def verify_installed_repository_data_table_entries(self, required_data_table_entries): # The value of the received required_data_table_entries will be something like: [ 'sam_fa_indexes' ] shed_tool_data_table_conf = self.shed_tool_data_table_conf diff --git a/lib/tool_shed/test/functional/test_1010_install_repository_with_tool_dependencies.py b/lib/tool_shed/test/functional/test_1010_install_repository_with_tool_dependencies.py index 42dcde1637e..4e66f2b8b2d 100644 --- a/lib/tool_shed/test/functional/test_1010_install_repository_with_tool_dependencies.py +++ b/lib/tool_shed/test/functional/test_1010_install_repository_with_tool_dependencies.py @@ -63,7 +63,5 @@ class TestToolWithToolDependencies(ShedTestCase): self.verify_installed_repository_metadata_unchanged(repository_name, common.test_user_1_name) def test_0025_verify_sample_files(self): - """Non-Data-Manager repositories no longer auto-register data tables on install - (galaxyproject/galaxy#21448); confirm sam_fa_indexes is absent from - shed_tool_data_table_conf.xml.""" - self.verify_no_installed_repository_data_table_entries(table_names=["sam_fa_indexes"]) + """Verify that the installed repository populated shed_tool_data_table.xml and the sample files.""" + self.verify_installed_repository_data_table_entries(required_data_table_entries=["sam_fa_indexes"])