diff options
| author | Mike Frysinger <vapier@google.com> | 2023-08-21 21:20:32 -0400 |
|---|---|---|
| committer | LUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-08-22 18:32:22 +0000 |
| commit | 6447733eb28ea188d551ae518a7e51ebf63a4350 (patch) | |
| tree | 3e2571b39af0f8544dae4660ebc1d29e2a7bda9d /tests | |
| parent | 06ddc8c50a7e802dbaf8468144c2b5773cda3714 (diff) | |
| download | git-repo-6447733eb28ea188d551ae518a7e51ebf63a4350.tar.gz | |
isort: format codebasev2.36
Change-Id: I6f11d123b68fd077f558d3c21349c55c5f251019
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/383715
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')
| -rw-r--r-- | tests/test_error.py | 7 | ||||
| -rw-r--r-- | tests/test_git_command.py | 3 | ||||
| -rw-r--r-- | tests/test_git_superproject.py | 3 | ||||
| -rw-r--r-- | tests/test_hooks.py | 3 | ||||
| -rw-r--r-- | tests/test_project.py | 2 | ||||
| -rw-r--r-- | tests/test_subcmds_sync.py | 7 | ||||
| -rw-r--r-- | tests/test_subcmds_upload.py | 3 |
7 files changed, 17 insertions, 11 deletions
diff --git a/tests/test_error.py b/tests/test_error.py index 2b28f5c2..a74ed2d7 100644 --- a/tests/test_error.py +++ b/tests/test_error.py | |||
| @@ -18,13 +18,14 @@ import inspect | |||
| 18 | import pickle | 18 | import pickle |
| 19 | import unittest | 19 | import unittest |
| 20 | 20 | ||
| 21 | import command | ||
| 21 | import error | 22 | import error |
| 22 | import project | ||
| 23 | import git_command | ||
| 24 | import fetch | 23 | import fetch |
| 25 | import command | 24 | import git_command |
| 25 | import project | ||
| 26 | from subcmds import all_modules | 26 | from subcmds import all_modules |
| 27 | 27 | ||
| 28 | |||
| 28 | imports = all_modules + [ | 29 | imports = all_modules + [ |
| 29 | error, | 30 | error, |
| 30 | project, | 31 | project, |
diff --git a/tests/test_git_command.py b/tests/test_git_command.py index 3dd31b29..c803d280 100644 --- a/tests/test_git_command.py +++ b/tests/test_git_command.py | |||
| @@ -14,11 +14,12 @@ | |||
| 14 | 14 | ||
| 15 | """Unittests for the git_command.py module.""" | 15 | """Unittests for the git_command.py module.""" |
| 16 | 16 | ||
| 17 | import re | ||
| 18 | import os | 17 | import os |
| 18 | import re | ||
| 19 | import subprocess | 19 | import subprocess |
| 20 | import unittest | 20 | import unittest |
| 21 | 21 | ||
| 22 | |||
| 22 | try: | 23 | try: |
| 23 | from unittest import mock | 24 | from unittest import mock |
| 24 | except ImportError: | 25 | except ImportError: |
diff --git a/tests/test_git_superproject.py b/tests/test_git_superproject.py index eb542c60..f884f507 100644 --- a/tests/test_git_superproject.py +++ b/tests/test_git_superproject.py | |||
| @@ -21,10 +21,11 @@ import tempfile | |||
| 21 | import unittest | 21 | import unittest |
| 22 | from unittest import mock | 22 | from unittest import mock |
| 23 | 23 | ||
| 24 | from test_manifest_xml import sort_attributes | ||
| 25 | |||
| 24 | import git_superproject | 26 | import git_superproject |
| 25 | import git_trace2_event_log | 27 | import git_trace2_event_log |
| 26 | import manifest_xml | 28 | import manifest_xml |
| 27 | from test_manifest_xml import sort_attributes | ||
| 28 | 29 | ||
| 29 | 30 | ||
| 30 | class SuperprojectTestCase(unittest.TestCase): | 31 | class SuperprojectTestCase(unittest.TestCase): |
diff --git a/tests/test_hooks.py b/tests/test_hooks.py index 78277128..76e928f7 100644 --- a/tests/test_hooks.py +++ b/tests/test_hooks.py | |||
| @@ -14,9 +14,10 @@ | |||
| 14 | 14 | ||
| 15 | """Unittests for the hooks.py module.""" | 15 | """Unittests for the hooks.py module.""" |
| 16 | 16 | ||
| 17 | import hooks | ||
| 18 | import unittest | 17 | import unittest |
| 19 | 18 | ||
| 19 | import hooks | ||
| 20 | |||
| 20 | 21 | ||
| 21 | class RepoHookShebang(unittest.TestCase): | 22 | class RepoHookShebang(unittest.TestCase): |
| 22 | """Check shebang parsing in RepoHook.""" | 23 | """Check shebang parsing in RepoHook.""" |
diff --git a/tests/test_project.py b/tests/test_project.py index bc8330b2..79728d70 100644 --- a/tests/test_project.py +++ b/tests/test_project.py | |||
| @@ -22,9 +22,9 @@ import tempfile | |||
| 22 | import unittest | 22 | import unittest |
| 23 | 23 | ||
| 24 | import error | 24 | import error |
| 25 | import manifest_xml | ||
| 26 | import git_command | 25 | import git_command |
| 27 | import git_config | 26 | import git_config |
| 27 | import manifest_xml | ||
| 28 | import platform_utils | 28 | import platform_utils |
| 29 | import project | 29 | import project |
| 30 | 30 | ||
diff --git a/tests/test_subcmds_sync.py b/tests/test_subcmds_sync.py index 71b0f8e0..b9f0a746 100644 --- a/tests/test_subcmds_sync.py +++ b/tests/test_subcmds_sync.py | |||
| @@ -16,16 +16,17 @@ | |||
| 16 | import os | 16 | import os |
| 17 | import shutil | 17 | import shutil |
| 18 | import tempfile | 18 | import tempfile |
| 19 | import unittest | ||
| 20 | import time | 19 | import time |
| 20 | import unittest | ||
| 21 | from unittest import mock | 21 | from unittest import mock |
| 22 | 22 | ||
| 23 | import pytest | 23 | import pytest |
| 24 | 24 | ||
| 25 | import command | 25 | import command |
| 26 | from subcmds import sync | 26 | from error import GitError |
| 27 | from error import RepoExitError | ||
| 27 | from project import SyncNetworkHalfResult | 28 | from project import SyncNetworkHalfResult |
| 28 | from error import GitError, RepoExitError | 29 | from subcmds import sync |
| 29 | 30 | ||
| 30 | 31 | ||
| 31 | @pytest.mark.parametrize( | 32 | @pytest.mark.parametrize( |
diff --git a/tests/test_subcmds_upload.py b/tests/test_subcmds_upload.py index 75811996..cd888977 100644 --- a/tests/test_subcmds_upload.py +++ b/tests/test_subcmds_upload.py | |||
| @@ -17,8 +17,9 @@ | |||
| 17 | import unittest | 17 | import unittest |
| 18 | from unittest import mock | 18 | from unittest import mock |
| 19 | 19 | ||
| 20 | from error import GitError | ||
| 21 | from error import UploadError | ||
| 20 | from subcmds import upload | 22 | from subcmds import upload |
| 21 | from error import UploadError, GitError | ||
| 22 | 23 | ||
| 23 | 24 | ||
| 24 | class UnexpectedError(Exception): | 25 | class UnexpectedError(Exception): |
