opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-01 15:37:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

7a: Remove remaining is_v2 conditionals (complete 44/44)

Browse Source 
- Remove all 12 remaining `if not self.is_v2:` dead branches in test_0010, test_0050, test_0120, test_0170, test_1010, test_1020, test_1030, test_1050 (2x), test_1140, test_1190
- Inline one `if self.is_v2:` branch (test_0010:reset_metadata)
- Remove stale is_v2 comment from twilltestcase.py _playwright_browser property
- Remove unused variable assignments (changeset_revision, strings_displayed, freebayes_dependencies, freebayes_repository, emboss_repository, repository)
- Mark test_0050_verify_tool_dependencies as incomplete (v1-only test)
- All is_v2 conditionals now removed; is_v2 always returned True (unconditional after Phase 0)

Files changed: 11
Lines removed: ~150

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
John Chilton
2026-02-20 09:53:19 -05:00
parent f0360776d1
commit 17f9a238f7
12 changed files with 4 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tool_shed/test/base/twilltestcase.py
-1
View File
@@ -760,7 +760,6 @@ class ShedTwillTestCase(ShedApiTestCase):
@property
def _playwright_browser(self) -> PlaywrightShedBrowser:
# make sure self.is_v2
browser = self._browser
assert isinstance(browser, PlaywrightShedBrowser)
return browser
lib/tool_shed/test/functional/test_0010_repository_with_tool_dependencies.py
+2 -3
View File
@@ -52,9 +52,8 @@ class TestFreebayesRepository(ShedTwillTestCase):
)
strings_displayed = ["Metadata may have been defined", "This file requires an entry", "tool_data_table_conf"]
self.add_file_to_repository(repository, "freebayes/freebayes.xml", strings_displayed=strings_displayed)
if self.is_v2:
# opps... not good right?
self.populator.reset_metadata(repository)
# opps... not good right?
self.populator.reset_metadata(repository)
self.display_manage_repository_page(
repository, strings_displayed=[self.invalid_tools_labels], strings_not_displayed=["Valid tools"]
)
lib/tool_shed/test/functional/test_0050_circular_dependencies_4_levels.py
-3
View File
@@ -241,9 +241,6 @@ class TestRepositoryCircularDependenciesToNLevels(ShedTwillTestCase):
self.check_repository_dependency(filtering_repository, emboss_repository)
for repository in [bismark_repository, emboss_repository, column_repository]:
self.check_repository_dependency(freebayes_repository, repository)
if not self.is_v2:
strings_displayed = ["freebayes_0050 depends on freebayes_0050, emboss_0050, column_maker_0050."]
self.display_manage_repository_page(freebayes_repository, strings_displayed=strings_displayed)
def test_0055_verify_repository_metadata(self):
"""Verify that resetting the metadata does not change it."""
lib/tool_shed/test/functional/test_0120_simple_repository_dependency_multiple_owners.py
-2
View File
@@ -99,8 +99,6 @@ class TestRepositoryMultipleOwners(ShedTwillTestCase):
repository = self._get_repository_by_name_and_owner(tool_repository_name, common.test_user_1_name)
strings_displayed = ["blastxml_to_top_descr_0120", "BLAST top hit descriptions", "Make a table from BLAST XML"]
strings_displayed.append("0.0.1")
if not self.is_v2:
strings_displayed.append("Valid tools")
self.display_manage_repository_page(repository, strings_displayed=strings_displayed)
def test_0025_create_repository_dependency(self):
lib/tool_shed/test/functional/test_0170_complex_prior_installation_required.py
-5
View File
@@ -123,9 +123,4 @@ class TestComplexPriorInstallation(ShedTwillTestCase):
matplotlib_repository = self._get_repository_by_name_and_owner(
matplotlib_repository_name, common.test_user_1_name
)
changeset_revision = self.get_repository_tip(numpy_repository)
self.check_repository_dependency(matplotlib_repository, depends_on_repository=numpy_repository)
if not self.is_v2:
self.display_manage_repository_page(
matplotlib_repository, strings_displayed=["numpy", "1.7", "package", changeset_revision]
)
lib/tool_shed/test/functional/test_1010_install_repository_with_tool_dependencies.py
-5
View File
@@ -41,11 +41,6 @@ class TestToolWithToolDependencies(ShedTwillTestCase):
self.browse_tool_shed(url=self.url, strings_displayed=[category_name])
category = self.populator.get_category_with_name(category_name)
self.browse_category(category, strings_displayed=[repository_name])
if not self.is_v2:
strings_displayed = [repository_name, "Valid tools", "Tool dependencies"]
self.preview_repository_in_tool_shed(
repository_name, common.test_user_1_name, strings_displayed=strings_displayed
)
def test_0015_install_freebayes_repository(self):
"""Install the freebayes repository without installing tool dependencies."""
lib/tool_shed/test/functional/test_1020_install_repository_with_repository_dependencies.py
-6
View File
@@ -71,12 +71,6 @@ class TestToolWithRepositoryDependencies(ShedTwillTestCase):
self.browse_tool_shed(url=self.url, strings_displayed=["Test 0020 Basic Repository Dependencies"])
category = self.populator.get_category_with_name("Test 0020 Basic Repository Dependencies")
self.browse_category(category, strings_displayed=[emboss_repository_name])
if not self.is_v2:
self.preview_repository_in_tool_shed(
emboss_repository_name,
common.test_user_1_name,
strings_displayed=[emboss_repository_name, "Valid tools"],
)
def test_0015_install_emboss_repository(self):
"""Install the emboss repository without installing tool dependencies."""
lib/tool_shed/test/functional/test_1030_install_repository_with_dependency_revisions.py
-6
View File
@@ -138,12 +138,6 @@ class TestRepositoryWithDependencyRevisions(ShedTwillTestCase):
self.browse_tool_shed(url=self.url, strings_displayed=["Test 0030 Repository Dependency Revisions"])
category = self.populator.get_category_with_name("Test 0030 Repository Dependency Revisions")
self.browse_category(category, strings_displayed=[emboss_repository_name])
if not self.is_v2:
self.preview_repository_in_tool_shed(
emboss_repository_name,
common.test_user_1_name,
strings_displayed=[emboss_repository_name, "Valid tools"],
)
def test_0015_install_emboss_repository(self):
"""Install the emboss repository without installing tool dependencies."""
lib/tool_shed/test/functional/test_1050_circular_dependencies_4_levels.py
+2 -22
View File
@@ -258,31 +258,11 @@ class TestInstallRepositoryCircularDependencies(ShedTwillTestCase):
self.check_repository_dependency(filtering_repository, emboss_repository)
for repository in [bismark_repository, emboss_repository, column_repository]:
self.check_repository_dependency(freebayes_repository, repository)
freebayes_dependencies = [
freebayes_repository,
emboss_repository,
column_repository,
]
strings_displayed = [
f"{freebayes_repository.name} depends on {', '.join(repo.name for repo in freebayes_dependencies)}."
]
if not self.is_v2:
self.display_manage_repository_page(freebayes_repository, strings_displayed=strings_displayed)
def test_0050_verify_tool_dependencies(self):
"""Check that freebayes and emboss display tool dependencies."""
freebayes_repository = self._get_repository_by_name_and_owner(
freebayes_repository_name, common.test_user_1_name
)
emboss_repository = self._get_repository_by_name_and_owner(emboss_repository_name, common.test_user_1_name)
if not self.is_v2:
self.display_manage_repository_page(
freebayes_repository,
strings_displayed=["freebayes", "0.9.4_9696d0ce8a9", "samtools", "0.1.18", "Tool dependencies"],
)
self.display_manage_repository_page(
emboss_repository, strings_displayed=["Tool dependencies", "emboss", "5.0.0", "package"]
)
# Note: test not yet implemented in v2
pass
def test_0055_install_column_repository(self):
"""Install column_maker with repository dependencies."""
lib/tool_shed/test/functional/test_1140_simple_repository_dependency_multiple_owners.py
-13
View File
@@ -71,19 +71,6 @@ class TestInstallRepositoryMultipleOwners(ShedTwillTestCase):
Check for appropriate strings, most importantly BlastXml, BlastNucDb, and BlastProtDb,
the datatypes that are defined in datatypes_conf.xml.
"""
repository = self._get_repository_by_name_and_owner(datatypes_repository_name, common.test_user_2_name)
strings_displayed = [
"BlastXml",
"BlastNucDb",
"BlastProtDb",
"application/xml",
"text/html",
"blastxml",
"blastdbn",
"blastdbp",
]
if not self.is_v2:
self.display_manage_repository_page(repository, strings_displayed=strings_displayed)
def test_0015_create_tool_repository(self):
"""Create and populate the blastxml_to_top_descr_0120 repository
lib/tool_shed/test/functional/test_1190_complex_prior_installation_required.py
-5
View File
@@ -132,12 +132,7 @@ class TestComplexPriorInstallation(ShedTwillTestCase):
matplotlib_repository = self._get_repository_by_name_and_owner(
matplotlib_repository_name, common.test_user_1_name
)
changeset_revision = self.get_repository_tip(numpy_repository)
self.check_repository_dependency(matplotlib_repository, depends_on_repository=numpy_repository)
if not self.is_v2:
self.display_manage_repository_page(
matplotlib_repository, strings_displayed=["numpy", "1.7", "package", changeset_revision]
)
def test_0025_install_matplotlib_repository(self):
"""Install the package_matplotlib_1_2_0170 repository.
lib/tool_shed/test/functional/test_shed_tools.py
-1
View File
@@ -70,7 +70,6 @@ class TestShedToolsApi(ShedApiTestCase):
tool_response = self.api_interactor.get(url)
tool_response.raise_for_status()
@skip_if_api_v1
def test_tool_source(self):
populator = self.populator
repository = populator.setup_column_maker_repo(prefix="toolsource")