--- a/mercurial/debugcommands.py	Sat May 28 22:08:13 2022 +0200
+++ b/mercurial/debugcommands.py	Sun May 29 12:25:24 2022 +0200
@@ -2806,7 +2806,7 @@
     [(b'r', b'rev', b'', _(b'revision to debug'), _(b'REV'))],
     _(b'[-r REV]'),
 )
-def debugp1copies(ui, repo, **opts):
+def debugp2copies(ui, repo, **opts):
     """dump copy information compared to p2"""
 
     opts = pycompat.byteskwargs(opts)

--- a/tests/hghave.py	Sat May 28 22:08:13 2022 +0200
+++ b/tests/hghave.py	Sun May 29 12:25:24 2022 +0200
@@ -198,7 +198,7 @@
 
 
 @check("pyoxidizer", "running with pyoxidizer build as 'hg'")
-def has_rhg():
+def has_pyoxidizer():
     return 'PYOXIDIZED_INSTALLED_AS_HG' in os.environ
 
 
@@ -408,7 +408,7 @@
 
 
 @check("pygit2", "pygit2 Python library")
-def has_git():
+def has_pygit2():
     try:
         import pygit2
 
@@ -750,7 +750,7 @@
 
 
 @check("network-io", "whether tests are allowed to access 3rd party services")
-def has_test_repo():
+def has_network_io():
     t = os.environ.get("HGTESTS_ALLOW_NETIO")
     return t == "1"