From 4839d9ba637c7146c7c2ac95de3d2627e3af928a Mon Sep 17 00:00:00 2001 From: DENEL Bertrand Date: Tue, 4 Nov 2025 18:45:37 -0600 Subject: [PATCH 1/4] Draft --- geos-ats/src/geos/ats/main.py | 10 ++++------ geos-ats/src/geos/ats/test_case.py | 7 +++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/geos-ats/src/geos/ats/main.py b/geos-ats/src/geos/ats/main.py index efcec428..2e3ab800 100644 --- a/geos-ats/src/geos/ats/main.py +++ b/geos-ats/src/geos/ats/main.py @@ -1,4 +1,4 @@ -import sys +import sys import os import shutil import signal @@ -116,7 +116,7 @@ def getLogDirBaseName(): def create_log_directory( options ): """ - When the action will run tests (e.g. "run", "rerun", "check", "continue", then the + When the action will run tests (e.g. "run", "rerun", "check", "continue"), then the LogDir is numbered, and saved. When the action does not run tests, the LogDir is temporary, and only sticks around if geos_ats exited abnormally. @@ -150,10 +150,8 @@ def create_log_directory( options ): logger.error( "unable to name a symlink to to logdir" ) else: - if options.action in test_actions: - options.logs = "%s.%s" % ( getLogDirBaseName(), options.action ) - elif options.info: - options.logs = "%s.info" % ( getLogDirBaseName() ) + # For non-test actions (list, report, etc.) + options.logs = "%s.%s" % ( getLogDirBaseName(), options.action ) else: if not os.path.join( options.logs ): os.mkdir( options.logs ) diff --git a/geos-ats/src/geos/ats/test_case.py b/geos-ats/src/geos/ats/test_case.py index 7affe6c9..efa6cc6d 100644 --- a/geos-ats/src/geos/ats/test_case.py +++ b/geos-ats/src/geos/ats/test_case.py @@ -93,6 +93,13 @@ def initialize( self, name, desc, label=None, labels=None, steps=[], batch=Batch logger.debug( e ) raise Exception() + # Setup labels + if labels is None: + labels = [] + if label is not None: + labels = labels + [label] + self.labels = labels + # Setup other parameters self.dictionary = {} self.dictionary.update( kw ) From c3b180db5e7ca3bd5facb4d95c2b7ee5b8872e2d Mon Sep 17 00:00:00 2001 From: DENEL Bertrand Date: Tue, 4 Nov 2025 19:40:02 -0600 Subject: [PATCH 2/4] Style --- geos-ats/src/geos/ats/test_case.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geos-ats/src/geos/ats/test_case.py b/geos-ats/src/geos/ats/test_case.py index efa6cc6d..6757857f 100644 --- a/geos-ats/src/geos/ats/test_case.py +++ b/geos-ats/src/geos/ats/test_case.py @@ -97,7 +97,7 @@ def initialize( self, name, desc, label=None, labels=None, steps=[], batch=Batch if labels is None: labels = [] if label is not None: - labels = labels + [label] + labels = labels + [ label ] self.labels = labels # Setup other parameters From 62d221bfb412f9d441215ca112dc62007cc9d16f Mon Sep 17 00:00:00 2001 From: alexbenedicto Date: Wed, 5 Nov 2025 11:10:36 -0800 Subject: [PATCH 3/4] Small change --- geos-ats/src/geos/ats/test_case.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geos-ats/src/geos/ats/test_case.py b/geos-ats/src/geos/ats/test_case.py index 6757857f..6550b49d 100644 --- a/geos-ats/src/geos/ats/test_case.py +++ b/geos-ats/src/geos/ats/test_case.py @@ -96,7 +96,7 @@ def initialize( self, name, desc, label=None, labels=None, steps=[], batch=Batch # Setup labels if labels is None: labels = [] - if label is not None: + else: labels = labels + [ label ] self.labels = labels From 6bb58dc501fbfdb3d81f4b5fb544d20244c92fb0 Mon Sep 17 00:00:00 2001 From: alexbenedicto Date: Wed, 5 Nov 2025 13:26:49 -0800 Subject: [PATCH 4/4] Revert now that CI works --- geos-ats/src/geos/ats/test_case.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geos-ats/src/geos/ats/test_case.py b/geos-ats/src/geos/ats/test_case.py index 6550b49d..6757857f 100644 --- a/geos-ats/src/geos/ats/test_case.py +++ b/geos-ats/src/geos/ats/test_case.py @@ -96,7 +96,7 @@ def initialize( self, name, desc, label=None, labels=None, steps=[], batch=Batch # Setup labels if labels is None: labels = [] - else: + if label is not None: labels = labels + [ label ] self.labels = labels