aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xllvm_tools/llvm_bisection.py9
-rwxr-xr-xllvm_tools/llvm_bisection_unittest.py2
2 files changed, 6 insertions, 5 deletions
diff --git a/llvm_tools/llvm_bisection.py b/llvm_tools/llvm_bisection.py
index c8d694cd..b1898ea9 100755
--- a/llvm_tools/llvm_bisection.py
+++ b/llvm_tools/llvm_bisection.py
@@ -357,13 +357,14 @@ def main(args_output):
print(skip_revisions_message)
if args_output.cleanup:
- # Abondon all the CLs created for bisection
+ # Abandon all the CLs created for bisection
gerrit = os.path.join(args_output.chroot_path, 'chromite/bin/gerrit')
for build in bisect_state['jobs']:
try:
- subprocess.check_output([gerrit, 'abandon', build['cl']],
- stderr=subprocess.STDOUT,
- encoding='utf-8')
+ subprocess.check_output(
+ [gerrit, 'abandon', str(build['cl'])],
+ stderr=subprocess.STDOUT,
+ encoding='utf-8')
except subprocess.CalledProcessError as err:
# the CL may have been abandoned
if 'chromite.lib.gob_util.GOBError' not in err.output:
diff --git a/llvm_tools/llvm_bisection_unittest.py b/llvm_tools/llvm_bisection_unittest.py
index a40770a5..cc22dfa4 100755
--- a/llvm_tools/llvm_bisection_unittest.py
+++ b/llvm_tools/llvm_bisection_unittest.py
@@ -301,7 +301,7 @@ class LLVMBisectionTest(unittest.TestCase):
[
os.path.join(args_output.chroot_path, 'chromite/bin/gerrit'),
'abandon',
- cl,
+ str(cl),
],
stderr=subprocess.STDOUT,
encoding='utf-8',