osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38643?usp=email )
Change subject: testenv: show testsuite results at the end
......................................................................
testenv: show testsuite results at the end
Show the testsuite results from junit-*.log not after each testenv*.cfg
file is through, but for all of them at the end. This way the results
are in one place when running with multiple configs, we don't need to
scroll to the middle of the huge log to find out what tests passed with
a previous config.
Adjust the podman container stop and restart logic, so the last
container is still running until we use it for showing the results.
Change-Id: Ie4b70724a33932cd98ba0972db37bf72dc8affb8
---
M _testenv/testenv.py
M _testenv/testenv/testsuite.py
2 files changed, 12 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/43/38643/1
diff --git a/_testenv/testenv.py b/_testenv/testenv.py
index 23a2922..81b3aac 100755
--- a/_testenv/testenv.py
+++ b/_testenv/testenv.py
@@ -47,6 +47,10 @@
# Run the components + testsuite
cfg_count = 0
for cfg_name, cfg in testenv.testenv_cfg.cfgs.items():
+ # Restart podman container before running with another config
+ if testenv.args.podman and cfg_count:
+ testenv.podman.stop(True)
+
testenv.testenv_cfg.set_current(cfg_name)
if testenv.args.binary_repo:
@@ -58,15 +62,15 @@
testenv.testsuite.run(cfg)
testenv.daemons.stop()
testenv.testdir.clean_run_scripts("finished")
- testenv.testsuite.cat_junit_logs()
cfg_count += 1
testenv.set_log_prefix("[testenv]")
- # Restart podman container before running with another config
- if testenv.args.podman:
- restart = cfg_count < len(testenv.testenv_cfg.cfgs)
- testenv.podman.stop(restart)
+ # Show test results
+ testenv.testsuite.cat_junit_logs()
+
+ if testenv.args.podman:
+ testenv.podman.stop()
def init_podman():
diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py
index 3bc8d9d..1878b5c 100644
--- a/_testenv/testenv/testsuite.py
+++ b/_testenv/testenv/testsuite.py
@@ -145,10 +145,10 @@
colors = os.environ.get("TESTENV_SOURCE_HIGHLIGHT_COLORS", "esc256")
tool = f"source-highlight -f {shlex.quote(colors)} -s xml -i"
- pattern = os.path.join(testenv.testdir.testdir, "testsuite", "junit-*.log")
- for path in glob.glob(pattern):
+ pattern = os.path.join(testenv.testdir.testdir_topdir, "**", "junit-*.log")
+ for path in glob.glob(pattern, recursive=True):
cmd = f"echo && {tool} {shlex.quote(path)} && echo"
- logging.info(f"Showing {os.path.basename(path)}")
+ logging.info(f"Showing {os.path.relpath(path, testenv.testdir.testdir_topdir)}")
testenv.cmd.run(cmd)
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38643?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ie4b70724a33932cd98ba0972db37bf72dc8affb8
Gerrit-Change-Number: 38643
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38642?usp=email )
Change subject: sigtran: Make osmo_ss7_xua_server APIs private
......................................................................
Patch Set 2:
This change is ready for review.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38642?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Ie03697fdb2c9f95de011b21771261e52befb6018
Gerrit-Change-Number: 38642
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Comment-Date: Tue, 05 Nov 2024 14:55:52 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Attention is currently required from: pespin.
osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38640?usp=email )
Change subject: sigtran: Make osmo_ss7_user APIs private
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38640?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I59d8f70aa81ba396159af40ffd7e8cc6c27cb864
Gerrit-Change-Number: 38640
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 05 Nov 2024 14:01:13 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: pespin.
osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38639?usp=email )
Change subject: sigtran: Make osmo_ss7_link APIs private
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38639?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Ia6fa48bdc23adb15579852cff4873f654b3bf029
Gerrit-Change-Number: 38639
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 05 Nov 2024 13:59:45 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: pespin.
osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38638?usp=email )
Change subject: sigtran: Make osmo_ss7_linkset APIs private
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38638?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I3b16f858d890b0a31780a2b85a609eae6374665a
Gerrit-Change-Number: 38638
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 05 Nov 2024 13:58:14 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes