mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
21cc3a9d53
https://gerrit-review.googlesource.com/c/git-repo/+/363474/24..25 meant to improve run_tests UX by letting users rerun it quickly, but it also removed CQ enforcement of formatting since CQ passes args to run_tests. Run pytest first so devs don't have format first and always check black formatting so it's enforced in CQ. Bug: b/267675342 Change-Id: I09544f110a6eb71b0c6c640787e10b04991a804e Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/365727 Tested-by: Gavin Mak <gavinmak@google.com> Reviewed-by: Mike Frysinger <vapier@google.com> Commit-Queue: Gavin Mak <gavinmak@google.com>
41 lines
1.2 KiB
Python
Executable File
41 lines
1.2 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# Copyright 2019 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
"""Wrapper to run black and pytest with the right settings."""
|
|
|
|
import os
|
|
import subprocess
|
|
import sys
|
|
import pytest
|
|
|
|
|
|
def run_black():
|
|
"""Returns the exit code of running `black --check`."""
|
|
dirpath = os.path.dirname(os.path.realpath(__file__))
|
|
return subprocess.run(
|
|
[sys.executable, "-m", "black", "--check", dirpath], check=False
|
|
).returncode
|
|
|
|
|
|
def main(argv):
|
|
"""The main entry."""
|
|
pytest_ret = pytest.main(argv)
|
|
black_ret = run_black()
|
|
return 0 if not black_ret and not pytest_ret else 1
|
|
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(main(sys.argv[1:]))
|