testing: remove py3 option from install{_,-}mercurials

We should fully remove the Py2 test suite. One thing at a time.
mozilla · Nov 14, 2022 · c349acd · c349acd
1 parent e7c9116
commit c349acd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/testing/docker/test-runner-py2/Dockerfile b/testing/docker/test-runner-py2/Dockerfile
@@ -80,7 +80,7 @@ RUN pip install -e vct/hghooks
 RUN pip install -e vct/testing
 
 # Install Mercurials
-RUN python -m vcttesting.environment install-mercurials 2
+RUN python -m vcttesting.environment install-mercurials
 
 WORKDIR /app/vct
 CMD ["sh"]
diff --git a/testing/docker/test-runner/Dockerfile b/testing/docker/test-runner/Dockerfile
@@ -87,7 +87,7 @@ RUN git clone \
 WORKDIR /app/vct
 
 # Install Mercurials
-RUN python -m vcttesting.environment install-mercurials 3
+RUN python -m vcttesting.environment install-mercurials
 
 VOLUME /app/vct
 

diff --git a/testing/vcttesting/environment.py b/testing/vcttesting/environment.py
@@ -109,7 +109,7 @@ def install_editable(venv, relpath, extra_env=None):
     subprocess.check_call(args, env=env)
 
 
-def install_mercurials(venv, hg='hg', py3=False):
+def install_mercurials(venv, hg='hg'):
     """Install supported Mercurial versions in a central location."""
     VERSIONS = [
         '5.5.2',
@@ -295,7 +295,7 @@ def create_global():
             install_editable(venv, package)
 
     install_mercurials(venv_py2)
-    install_mercurials(venv_py3, py3=True)
+    install_mercurials(venv_py3)
 
     cinnabar_dest = os.path.join(venv_py2['path'], 'git-cinnabar')
     install_cinnabar(dest=cinnabar_dest)
@@ -332,6 +332,5 @@ def create_global():
         'python': os.path.join('/app', 'venv', 'bin', 'python'),
     }
 
-    py3 = sys.argv[2] == '3'
-    install_mercurials(venv, hg='hg', py3=py3)
+    install_mercurials(venv, hg='hg')
     sys.exit(0)