Skip to content

Commit 5e06091

Browse files
authored
test_engine_globals.py: add type annotations and update uninitialized vars (#1191)
1 parent cc8de7d commit 5e06091

File tree

1 file changed

+26
-24
lines changed

1 file changed

+26
-24
lines changed

src/sst/core/testingframework/test_engine_globals.py

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,42 +15,44 @@
1515
"""
1616
import os
1717

18-
from typing import TYPE_CHECKING
18+
from typing import Dict, List, TYPE_CHECKING
1919

2020
if TYPE_CHECKING:
2121
import configparser
2222

23+
from test_engine_junit import JUnitTestCase
24+
2325
# Verbose Defines
2426
VERBOSE_QUIET = 0
2527
VERBOSE_NORMAL = 1
2628
VERBOSE_LOUD = 2
2729
VERBOSE_DEBUG = 3
2830

2931
# Global Var Defines
30-
TESTRUN_TESTRUNNINGFLAG = None
31-
TESTRUN_SINGTHREAD_TESTSUITE_NAME = None
32-
TESTRUN_JUNIT_TESTCASE_DICTLISTS = None
32+
TESTRUN_TESTRUNNINGFLAG = False
33+
TESTRUN_SINGTHREAD_TESTSUITE_NAME = ""
34+
TESTRUN_JUNIT_TESTCASE_DICTLISTS: Dict[str, List["JUnitTestCase"]] = dict()
3335

34-
TESTOUTPUT_TOPDIRPATH = None
35-
TESTOUTPUT_RUNDIRPATH = None
36-
TESTOUTPUT_TMPDIRPATH = None
37-
TESTOUTPUT_XMLDIRPATH = None
36+
TESTOUTPUT_TOPDIRPATH = ""
37+
TESTOUTPUT_RUNDIRPATH = ""
38+
TESTOUTPUT_TMPDIRPATH = ""
39+
TESTOUTPUT_XMLDIRPATH = ""
3840

39-
TESTENGINE_CONCURRENTMODE = None
40-
TESTENGINE_THREADLIMIT = None
41-
TESTENGINE_DEBUGMODE = None
42-
TESTENGINE_LOGFAILMODE = None
43-
TESTENGINE_IGNORESKIPS = None
44-
TESTENGINE_VERBOSITY = None
45-
TESTENGINE_SSTRUN_NUMRANKS = None
46-
TESTENGINE_SSTRUN_NUMTHREADS = None
47-
TESTENGINE_SSTRUN_GLOBALARGS = None
48-
TESTENGINE_CORE_CONFFILE_PARSER = None
49-
TESTENGINE_CORE_CONFINCLUDE_DICT = None
50-
TESTENGINE_ELEM_CONFINCLUDE_DICT = None
41+
TESTENGINE_CONCURRENTMODE = False
42+
TESTENGINE_THREADLIMIT = 8
43+
TESTENGINE_DEBUGMODE = False
44+
TESTENGINE_LOGFAILMODE = False
45+
TESTENGINE_IGNORESKIPS = False
46+
TESTENGINE_VERBOSITY = 1
47+
TESTENGINE_SSTRUN_NUMRANKS = 1
48+
TESTENGINE_SSTRUN_NUMTHREADS = 1
49+
TESTENGINE_SSTRUN_GLOBALARGS = ""
50+
TESTENGINE_CORE_CONFFILE_PARSER: "configparser.RawConfigParser" = None # type: ignore [assignment]
51+
TESTENGINE_CORE_CONFINCLUDE_DICT: Dict[str, str] = dict()
52+
TESTENGINE_ELEM_CONFINCLUDE_DICT: Dict[str, str] = dict()
5153
TESTENGINE_ERRORCOUNT = 0
52-
TESTENGINE_SCENARIOSLIST = None
53-
TESTENGINE_TESTNOTESLIST = None
54+
TESTENGINE_SCENARIOSLIST: List[str] = []
55+
TESTENGINE_TESTNOTESLIST: List[str] = []
5456

5557
# These are some globals to pass data between the top level test engine
5658
# and the lower level testscripts
@@ -98,8 +100,8 @@ def init_test_engine_globals() -> None:
98100
TESTENGINE_VERBOSITY = 1
99101
TESTENGINE_SSTRUN_NUMRANKS = 1
100102
TESTENGINE_SSTRUN_NUMTHREADS = 1
101-
TESTENGINE_SSTRUN_GLOBALARGS = ["xxx"]
102-
TESTENGINE_CORE_CONFFILE_PARSER = None
103+
TESTENGINE_SSTRUN_GLOBALARGS = "xxx"
104+
TESTENGINE_CORE_CONFFILE_PARSER = None # type: ignore [assignment]
103105
TESTENGINE_CORE_CONFINCLUDE_DICT = {}
104106
TESTENGINE_ELEM_CONFINCLUDE_DICT = {}
105107
TESTENGINE_ERRORCOUNT = 0

0 commit comments

Comments
 (0)