diff --git a/repo b/repo index 85825e80..d9e28ab0 100755 --- a/repo +++ b/repo @@ -124,7 +124,7 @@ if not REPO_REV: BUG_URL = "https://issues.gerritcodereview.com/issues/new?component=1370071" # increment this whenever we make important changes to this script -VERSION = (2, 50) +VERSION = (2, 54) # increment this if the MAINTAINER_KEYS block is modified KEYRING_VERSION = (2, 3) @@ -483,11 +483,6 @@ def InitParser(parser): # This is a poor replacement for subprocess.run until we require Python 3.6+. -RunResult = collections.namedtuple( - "RunResult", ("returncode", "stdout", "stderr") -) - - class RunError(Exception): """Error when running a command failed.""" @@ -526,7 +521,9 @@ def run_command(cmd, **kwargs): elif stderr == subprocess.STDOUT: dbg += " 2>&1" trace.print(dbg) - ret = RunResult(proc.returncode, decode(stdout), decode(stderr)) + ret = subprocess.CompletedProcess( + cmd, proc.returncode, decode(stdout), decode(stderr) + ) # If things failed, print useful debugging output. if check and ret.returncode: @@ -553,7 +550,6 @@ def run_command(cmd, **kwargs): class CloneFailure(Exception): - """Indicate the remote clone of repo itself failed.""" diff --git a/tests/test_wrapper.py b/tests/test_wrapper.py index 8bebdf80..8bb5eb28 100644 --- a/tests/test_wrapper.py +++ b/tests/test_wrapper.py @@ -17,6 +17,7 @@ import io import os import re +import subprocess import sys import tempfile import unittest @@ -358,8 +359,8 @@ class VerifyRev(RepoWrapperTestCase): def test_verify_passes(self): """Check when we have a valid signed tag.""" - desc_result = self.wrapper.RunResult(0, "v1.0\n", "") - gpg_result = self.wrapper.RunResult(0, "", "") + desc_result = subprocess.CompletedProcess([], 0, "v1.0\n", "") + gpg_result = subprocess.CompletedProcess([], 0, "", "") with mock.patch.object( self.wrapper, "run_git", side_effect=(desc_result, gpg_result) ): @@ -370,8 +371,8 @@ class VerifyRev(RepoWrapperTestCase): def test_unsigned_commit(self): """Check we fall back to signed tag when we have an unsigned commit.""" - desc_result = self.wrapper.RunResult(0, "v1.0-10-g1234\n", "") - gpg_result = self.wrapper.RunResult(0, "", "") + desc_result = subprocess.CompletedProcess([], 0, "v1.0-10-g1234\n", "") + gpg_result = subprocess.CompletedProcess([], 0, "", "") with mock.patch.object( self.wrapper, "run_git", side_effect=(desc_result, gpg_result) ): @@ -382,7 +383,7 @@ class VerifyRev(RepoWrapperTestCase): def test_verify_fails(self): """Check we fall back to signed tag when we have an unsigned commit.""" - desc_result = self.wrapper.RunResult(0, "v1.0-10-g1234\n", "") + desc_result = subprocess.CompletedProcess([], 0, "v1.0-10-g1234\n", "") gpg_result = Exception with mock.patch.object( self.wrapper, "run_git", side_effect=(desc_result, gpg_result)