Skip to content

Self test maintenance (log files) #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 14, 2023
Merged

Self test maintenance (log files) #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions test/component_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#
# --------------------------------------------------------------------------------------------------------------
#
VERSION = "0.8.0"
VERSION = "0.9.0"
VERSION_DATE = "13.09.2023"
#
# --------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -403,7 +403,6 @@ def AnalyzeExceptions(EXPECTEDEXCEPTION=None, sException=None):
EXPECTEDEXCEPTION = dictUsecase['EXPECTEDEXCEPTION']
EXPECTEDRETURN = dictUsecase['EXPECTEDRETURN']

# TODO: make this depend on test case; in some BADCASE test cases this might not be wanted:
JSONFILE = CString.NormalizePath(JSONFILE, sReferencePathAbs=TESTCONFIGPATH)

# get optional parameters
Expand Down
57 changes: 32 additions & 25 deletions test/libs/CConfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#
# XC-CT/ECA3-Queckenstedt
#
# 03.08.2023
# 13.09.2023
#
# --------------------------------------------------------------------------------------------------------------

Expand Down Expand Up @@ -69,22 +69,19 @@ def __init__(self, sCalledBy=None):
# -- configuration init
self.__dictConfig = {}

# -- configuration: basic environment
# -- configuration: common environment

THISSCRIPT = CString.NormalizePath(sCalledBy)
self.__dictConfig['THISSCRIPT'] = THISSCRIPT
self.__dictConfig['THISSCRIPTNAME'] = os.path.basename(THISSCRIPT)
REFERENCEPATH = os.path.dirname(THISSCRIPT) # position of main() script is reference for all relative paths
self.__dictConfig['REFERENCEPATH'] = REFERENCEPATH
self.__dictConfig['TESTCONFIGPATH'] = f"{REFERENCEPATH}/testconfig" # reference for all relative paths inside TestConfig.py
OSNAME = os.name
self.__dictConfig['OSNAME'] = OSNAME
PLATFORMSYSTEM = platform.system()
self.__dictConfig['PLATFORMSYSTEM'] = PLATFORMSYSTEM
self.__dictConfig['OSNAME'] = os.name
self.__dictConfig['PLATFORMSYSTEM'] = platform.system()
PYTHON = CString.NormalizePath(sys.executable)
self.__dictConfig['PYTHON'] = PYTHON
PYTHONPATH = os.path.dirname(PYTHON)
self.__dictConfig['PYTHONPATH'] = PYTHONPATH
self.__dictConfig['PYTHONPATH'] = os.path.dirname(PYTHON)
self.__dictConfig['PYTHONVERSION'] = sys.version

# -- configuration: command line
Expand All @@ -103,38 +100,48 @@ def __init__(self, sCalledBy=None):
TESTID = str(oCmdLineArgs.testid).strip()
self.__dictConfig['TESTID'] = TESTID

bCodeDump = False
CODEDUMP = False
if oCmdLineArgs.codedump != None:
bCodeDump = oCmdLineArgs.codedump
self.__dictConfig['CODEDUMP'] = bCodeDump
CODEDUMP = oCmdLineArgs.codedump
self.__dictConfig['CODEDUMP'] = CODEDUMP
# if True: script quits after config dump

bConfigDump = False
CONFIGDUMP = False
if oCmdLineArgs.configdump != None:
bConfigDump = oCmdLineArgs.configdump
self.__dictConfig['CONFIGDUMP'] = bConfigDump
CONFIGDUMP = oCmdLineArgs.configdump
self.__dictConfig['CONFIGDUMP'] = CONFIGDUMP
# if True: script quits after config dump

bRecreateInstance = False
RECREATEINSTANCE = False
if oCmdLineArgs.recreateinstance != None:
bRecreateInstance = oCmdLineArgs.recreateinstance
self.__dictConfig['RECREATEINSTANCE'] = bRecreateInstance
RECREATEINSTANCE = oCmdLineArgs.recreateinstance
self.__dictConfig['RECREATEINSTANCE'] = RECREATEINSTANCE

# -- log file and output folders
sLogFileName = "JPP_SelfTest.log"
if TESTID is not None:
if ';' not in TESTID:
# in case of a single TESTID is given in command line, we add this ID to the log file name
# (support of pytest, where every test case is executed separately)
sLogFileName = f"JPP_SelfTest_{TESTID}.log"

SELFTESTLOGFILE = f"{REFERENCEPATH}/testlogfiles/{sLogFileName}"

# self test log file: default settings
TESTLOGFILESFOLDER = f"{REFERENCEPATH}/testlogfiles"
SELFTESTLOGFILE = f"{TESTLOGFILESFOLDER}/JPP_SelfTest.log"
if oCmdLineArgs.logfile != None:
SELFTESTLOGFILE = oCmdLineArgs.logfile
SELFTESTLOGFILE = CString.NormalizePath(SELFTESTLOGFILE, sReferencePathAbs=REFERENCEPATH)
TESTLOGFILESFOLDER = os.path.dirname(SELFTESTLOGFILE)
# command line overwrites default log file location
SELFTESTLOGFILE = CString.NormalizePath(oCmdLineArgs.logfile, sReferencePathAbs=REFERENCEPATH)

TESTLOGFILESFOLDER = os.path.dirname(SELFTESTLOGFILE)
# update default values in config
self.__dictConfig['SELFTESTLOGFILE'] = SELFTESTLOGFILE
self.__dictConfig['TESTLOGFILESFOLDER'] = TESTLOGFILESFOLDER

# -- create output folder
oFolder = CFolder(TESTLOGFILESFOLDER)
bSuccess, sResult = oFolder.Create(bOverwrite=False, bRecursive=True)
del oFolder
if bSuccess is not True:
raise Exception(CString.FormatResult(sMethod, bSuccess, sResult))
self.__dictConfig['TESTLOGFILESFOLDER'] = TESTLOGFILESFOLDER
self.__dictConfig['SELFTESTLOGFILE'] = SELFTESTLOGFILE

# dump of basic configuration parameters to console
# self.DumpConfig() # done in main script now!
Expand Down