diff options
author | Gavin Mak <gavinmak@google.com> | 2023-03-30 05:06:01 +0000 |
---|---|---|
committer | LUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-03-31 04:25:53 +0000 |
commit | 57cb42861d37eec074a729f33d1c5aa90be86b3f (patch) | |
tree | a78a1a00714f3c1e484266a5870285b56331bee7 /run_tests | |
parent | e74d9046eeec52d7ccd433a4dad2cee30838c620 (diff) | |
download | git-repo-57cb42861d37eec074a729f33d1c5aa90be86b3f.tar.gz |
run_tests: Check flake8
This also gets enforced in CQ.
Bug: b/267675342
Change-Id: I8ffcc5d583275072fd61ae65ae4214b36bfa59f3
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/366799
Tested-by: Gavin Mak <gavinmak@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
Commit-Queue: Gavin Mak <gavinmak@google.com>
Diffstat (limited to 'run_tests')
-rwxr-xr-x | run_tests | 26 |
1 files changed, 19 insertions, 7 deletions
@@ -13,7 +13,7 @@ | |||
13 | # See the License for the specific language governing permissions and | 13 | # See the License for the specific language governing permissions and |
14 | # limitations under the License. | 14 | # limitations under the License. |
15 | 15 | ||
16 | """Wrapper to run black and pytest with the right settings.""" | 16 | """Wrapper to run linters and pytest with the right settings.""" |
17 | 17 | ||
18 | import os | 18 | import os |
19 | import subprocess | 19 | import subprocess |
@@ -21,19 +21,31 @@ import sys | |||
21 | import pytest | 21 | import pytest |
22 | 22 | ||
23 | 23 | ||
24 | ROOT_DIR = os.path.dirname(os.path.realpath(__file__)) | ||
25 | |||
26 | |||
24 | def run_black(): | 27 | def run_black(): |
25 | """Returns the exit code of running `black --check`.""" | 28 | """Returns the exit code from black.""" |
26 | dirpath = os.path.dirname(os.path.realpath(__file__)) | 29 | return subprocess.run( |
30 | [sys.executable, "-m", "black", "--check", ROOT_DIR], check=False | ||
31 | ).returncode | ||
32 | |||
33 | |||
34 | def run_flake8(): | ||
35 | """Returns the exit code from flake8.""" | ||
27 | return subprocess.run( | 36 | return subprocess.run( |
28 | [sys.executable, "-m", "black", "--check", dirpath], check=False | 37 | [sys.executable, "-m", "flake8", ROOT_DIR], check=False |
29 | ).returncode | 38 | ).returncode |
30 | 39 | ||
31 | 40 | ||
32 | def main(argv): | 41 | def main(argv): |
33 | """The main entry.""" | 42 | """The main entry.""" |
34 | pytest_ret = pytest.main(argv) | 43 | checks = ( |
35 | black_ret = run_black() | 44 | lambda: pytest.main(argv), |
36 | return 0 if not black_ret and not pytest_ret else 1 | 45 | run_black, |
46 | run_flake8, | ||
47 | ) | ||
48 | return 0 if all(not c() for c in checks) else 1 | ||
37 | 49 | ||
38 | 50 | ||
39 | if __name__ == "__main__": | 51 | if __name__ == "__main__": |