diff --git a/lib/galaxy/tool_util/toolbox/base.py b/lib/galaxy/tool_util/toolbox/base.py index 08af342f0d76..58db6337d29a 100644 --- a/lib/galaxy/tool_util/toolbox/base.py +++ b/lib/galaxy/tool_util/toolbox/base.py @@ -121,7 +121,6 @@ def handle_tags(self, tool_id, tool_definition_source): class NullToolTagManager(AbstractToolTagManager): - def reset_tags(self) -> None: return None diff --git a/lib/tool_shed/test/base/twilltestcase.py b/lib/tool_shed/test/base/twilltestcase.py index bde54b611eb5..8c15af3dc210 100644 --- a/lib/tool_shed/test/base/twilltestcase.py +++ b/lib/tool_shed/test/base/twilltestcase.py @@ -1988,10 +1988,9 @@ def _assert_has_installed_repository_dependency( changeset: Optional[str] = None, ) -> None: json = self.display_installed_repository_manage_json(installed_repository) - assert "repository_dependencies" in json, "No repository dependencies were defined in %s. manage json is %s" % ( - installed_repository.name, - json, - ) + if "repository_dependencies" not in json: + name = installed_repository.name + raise AssertionError(f"No repository dependencies were defined in {name}. manage json is {json}") repository_dependencies = json["repository_dependencies"] found = False for folder in repository_dependencies.get("folders"):