From 8bb7a18de2ca59b07a5dce23964b37bce7faa4fe Mon Sep 17 00:00:00 2001 From: Ferenc Szili Date: Mon, 25 Mar 2024 11:34:15 +0100 Subject: [PATCH] test/cql-pytest: add --omit-scylla-output to Cassandra test runs Currently, the tests in test/cql-pytest can be run against both ScyllaDB and Cassandra. Running the test for either will first output the test results, and subsequently print the stdout output of the process under test. Using the command line option --omit-scylla-output it is possible to disable this print for Scylla, but it is not possible for tests run against Cassandra. This change adds the option to suppress output for Cassandra tests, too. By default, the stdout of the Cassandra run will still be printed after the test results, but this can now be disabled with --omit-scylla-output Closes scylladb/scylladb#17996 --- test/cql-pytest/run | 2 -- test/cql-pytest/run.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/test/cql-pytest/run b/test/cql-pytest/run index cce4318c80..fe2f78f1c6 100755 --- a/test/cql-pytest/run +++ b/test/cql-pytest/run @@ -31,8 +31,6 @@ if "-h" in sys.argv or "--help" in sys.argv: run.run_pytest(sys.path[0], sys.argv) exit(0) -run.omit_scylla_output = "--omit-scylla-output" in sys.argv - pid = run.run_with_temporary_dir(cmd) ip = run.pid_to_ip(pid) diff --git a/test/cql-pytest/run.py b/test/cql-pytest/run.py index 07cd8dcb56..4326aaf4a7 100755 --- a/test/cql-pytest/run.py +++ b/test/cql-pytest/run.py @@ -156,7 +156,7 @@ def abort_run_with_dir(pid, tmpdir): def abort_run_with_temporary_dir(pid): return abort_run_with_dir(pid, pid_to_dir(pid)) -omit_scylla_output = False +omit_scylla_output = "--omit-scylla-output" in sys.argv summary='' run_pytest_pids = set()