summaryrefslogtreecommitdiffstats
path: root/tests/test_wrapper.py
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2025-03-21 23:27:05 -0400
committerLUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com>2025-03-24 11:49:00 -0700
commit243df2042ed756e7829cd39d3ebe3d1919444d5d (patch)
tree3bbc1516dd4b28795b0e83fe2abbe14c3064d7b4 /tests/test_wrapper.py
parent4b94e773efd36754f6c8649ad55b90d19a61107f (diff)
downloadgit-repo-243df2042ed756e7829cd39d3ebe3d1919444d5d.tar.gz
launcher: change RunResult to subprocess.CompletedProcess
Since we require Python 3.6 now in the launcher, swap out our custom RunResult class for the standard subprocess one. Change-Id: Idd8598df37c0a952d3ef828df6e250cab03c6589 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/462341 Reviewed-by: Gavin Mak <gavinmak@google.com> Tested-by: Mike Frysinger <vapier@google.com> Commit-Queue: Mike Frysinger <vapier@google.com>
Diffstat (limited to 'tests/test_wrapper.py')
-rw-r--r--tests/test_wrapper.py11
1 files changed, 6 insertions, 5 deletions
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 @@
17import io 17import io
18import os 18import os
19import re 19import re
20import subprocess
20import sys 21import sys
21import tempfile 22import tempfile
22import unittest 23import unittest
@@ -358,8 +359,8 @@ class VerifyRev(RepoWrapperTestCase):
358 359
359 def test_verify_passes(self): 360 def test_verify_passes(self):
360 """Check when we have a valid signed tag.""" 361 """Check when we have a valid signed tag."""
361 desc_result = self.wrapper.RunResult(0, "v1.0\n", "") 362 desc_result = subprocess.CompletedProcess([], 0, "v1.0\n", "")
362 gpg_result = self.wrapper.RunResult(0, "", "") 363 gpg_result = subprocess.CompletedProcess([], 0, "", "")
363 with mock.patch.object( 364 with mock.patch.object(
364 self.wrapper, "run_git", side_effect=(desc_result, gpg_result) 365 self.wrapper, "run_git", side_effect=(desc_result, gpg_result)
365 ): 366 ):
@@ -370,8 +371,8 @@ class VerifyRev(RepoWrapperTestCase):
370 371
371 def test_unsigned_commit(self): 372 def test_unsigned_commit(self):
372 """Check we fall back to signed tag when we have an unsigned commit.""" 373 """Check we fall back to signed tag when we have an unsigned commit."""
373 desc_result = self.wrapper.RunResult(0, "v1.0-10-g1234\n", "") 374 desc_result = subprocess.CompletedProcess([], 0, "v1.0-10-g1234\n", "")
374 gpg_result = self.wrapper.RunResult(0, "", "") 375 gpg_result = subprocess.CompletedProcess([], 0, "", "")
375 with mock.patch.object( 376 with mock.patch.object(
376 self.wrapper, "run_git", side_effect=(desc_result, gpg_result) 377 self.wrapper, "run_git", side_effect=(desc_result, gpg_result)
377 ): 378 ):
@@ -382,7 +383,7 @@ class VerifyRev(RepoWrapperTestCase):
382 383
383 def test_verify_fails(self): 384 def test_verify_fails(self):
384 """Check we fall back to signed tag when we have an unsigned commit.""" 385 """Check we fall back to signed tag when we have an unsigned commit."""
385 desc_result = self.wrapper.RunResult(0, "v1.0-10-g1234\n", "") 386 desc_result = subprocess.CompletedProcess([], 0, "v1.0-10-g1234\n", "")
386 gpg_result = Exception 387 gpg_result = Exception
387 with mock.patch.object( 388 with mock.patch.object(
388 self.wrapper, "run_git", side_effect=(desc_result, gpg_result) 389 self.wrapper, "run_git", side_effect=(desc_result, gpg_result)