Format codebase with black and check formatting in CQ

Apply rules set by https://gerrit-review.googlesource.com/c/git-repo/+/362954/ across the codebase and fix any lingering errors caught
by flake8. Also check black formatting in run_tests (and CQ).

Bug: b/267675342
Change-Id: I972d77649dac351150dcfeb1cd1ad0ea2efc1956
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/363474
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: Gavin Mak <gavinmak@google.com>
Commit-Queue: Gavin Mak <gavinmak@google.com>

1 files changed, 21 insertions, 3 deletions

diff --git a/run_tests b/run_tests
index 0ea098a6..e76f9d8c 100755
--- a/run_tests
+++ b/run_tests
@@ -13,10 +13,28 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Wrapper to run pytest with the right settings."""
+"""Wrapper to run black and pytest with the right settings."""
 
+import os
+import subprocess
 import sys
 import pytest
 
-if __name__ == '__main__':
-  sys.exit(pytest.main(sys.argv[1:]))
+
+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."""
+    black_ret = 0 if argv else run_black()
+    pytest_ret = pytest.main(argv)
+    return 0 if not black_ret and not pytest_ret else 1
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv[1:]))