Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions geos-ats/src/geos/ats/main.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import sys
import sys
import os
import shutil
import signal
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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 )
Expand Down
7 changes: 7 additions & 0 deletions geos-ats/src/geos/ats/test_case.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down