android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2025-06-26 20:17:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweak stdlib imports to follow Google style guide

Browse Source 
Google Python style guide says to import modules.
Clean up all our stdlib imports.  Leave the repo ones alone
for now as that's a much bigger shave.

Change-Id: Ida42fc2ae78b86e6b7a6cbc98f94ca04b295f8cc
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/383714
Reviewed-by: Gavin Mak <gavinmak@google.com>
Commit-Queue: Mike Frysinger <vapier@google.com>
Tested-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
Mike Frysinger
2023-08-21 21:26:51 -04:00
committed by LUCI
parent 16109a66b7
commit 06ddc8c50a
8 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_repo_logging.py
View File

@ -14,7 +14,7 @@
"""Unit test for repo_logging module."""
import unittest
from unittest.mock import MagicMock
from unittest import mock
from repo_logging import RepoLogger
@ -30,7 +30,7 @@ class TestRepoLogger(unittest.TestCase):
nonlocal result
result = log.getMessage()
mock_out = MagicMock()
mock_out = mock.MagicMock()
mock_out.level = 0
mock_out.handle = mock_handler
logger.addHandler(mock_out)
@ -49,7 +49,7 @@ class TestRepoLogger(unittest.TestCase):
nonlocal result
result = log.getMessage()
mock_out = MagicMock()
mock_out = mock.MagicMock()
mock_out.level = 0
mock_out.handle = mock_handler
logger.addHandler(mock_out)
@ -88,7 +88,7 @@ class TestRepoLogger(unittest.TestCase):
nonlocal result
result.append(log.getMessage())
mock_out = MagicMock()
mock_out = mock.MagicMock()
mock_out.level = 0
mock_out.handle = mock_handler
logger.addHandler(mock_out)

8
tests/test_wrapper.py
View File

@ -14,7 +14,7 @@
"""Unittests for the wrapper.py module."""
from io import StringIO
import io
import os
import re
import sys
@ -47,8 +47,10 @@ class RepoWrapperUnitTest(RepoWrapperTestCase):
def test_version(self):
"""Make sure _Version works."""
with self.assertRaises(SystemExit) as e:
with mock.patch("sys.stdout", new_callable=StringIO) as stdout:
with mock.patch("sys.stderr", new_callable=StringIO) as stderr:
with mock.patch("sys.stdout", new_callable=io.StringIO) as stdout:
with mock.patch(
"sys.stderr", new_callable=io.StringIO
) as stderr:
self.wrapper._Version()
self.assertEqual(0, e.exception.code)
self.assertEqual("", stderr.getvalue())