diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_wrapper.py | 11 | 
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 @@ | |||
| 17 | import io | 17 | import io | 
| 18 | import os | 18 | import os | 
| 19 | import re | 19 | import re | 
| 20 | import subprocess | ||
| 20 | import sys | 21 | import sys | 
| 21 | import tempfile | 22 | import tempfile | 
| 22 | import unittest | 23 | import 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) | 
