From 82a6f0fa1642e9527171279d1acc756d2fb2e4e5 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Jun 15 2021 04:20:16 +0000 Subject: [PATCH 1/2] Run tests in container from any dir --- diff --git a/dev/run-tests-container.py b/dev/run-tests-container.py index c89293e..3f0356a 100755 --- a/dev/run-tests-container.py +++ b/dev/run-tests-container.py @@ -5,6 +5,9 @@ import os import subprocess as sp +ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) + + def setup_parser(): """ Setup the cli arguments """ parser = argparse.ArgumentParser(prog="pagure-test") @@ -98,8 +101,8 @@ if __name__ == "__main__": "-t", container_name, "-f", - "dev/containers/%s" % container_files[idx], - "dev/containers", + ROOT + "/dev/containers/%s" % container_files[idx], + ROOT + "/dev/containers", ] print(" ".join(cmd)) output_code = sp.call(cmd) From 9c22e95e74602759d2b09da7aa9e5e69d21ee1fd Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Jun 15 2021 23:21:29 +0000 Subject: [PATCH 2/2] Use unbuffered output and show that tests are repeated https://stackoverflow.com/questions/3306518/cannot-pass-an-argument-to-python-with-usr-bin-env-python/21433197#21433197 --- diff --git a/dev/run-tests-container.py b/dev/run-tests-container.py index 3f0356a..39f0e87 100755 --- a/dev/run-tests-container.py +++ b/dev/run-tests-container.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/env -S python -u import argparse import os @@ -87,6 +87,8 @@ if __name__ == "__main__": ] failed = [] + print("Running for {} containers:".format(len(container_names))) + print(" - " + "\n - ".join(container_names)) for idx, container_name in enumerate(container_names): if args.skip_build is not False: print("------ Building Container Image -----")