Skip to content

Commit b7f03f0

Browse files
authored
Merge branch 'IBM:master' into ess_workload
2 parents 747bc3a + 25699bc commit b7f03f0

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

tests/test_configWatcher.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77

88
def my_setup():
9-
global path, logger, mainSensorsConfig, wrongSensorsConfig, zimonFile, sensorsCount
9+
global path, logger, mainSensorsConfig, wrongSensorsConfig, sensorsCount
1010
path = os.getcwd()
1111
logger = configureLogging(path, None)
1212
mainSensorsConfig = 'ZIMonSensors.cfg'

tests/test_params.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
def my_setup():
10-
global a, b, c, d, e, f, g, m, n, o, p, y, x, r, s
10+
global a, b, c, d, e, f, g, m, n, o, p, y, r, s
1111
a = ConfigManager().defaults
1212
y = ConfigManager().defaults.copy()
1313
y['apiKeyValue'] = '/tmp/mykey'

tests/test_zimon_config_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77

88
def my_setup():
9-
global path, logger, mainSensorsConfig, wrongSensorsConfig, zimonFile, sensorsCount
9+
global path, logger, mainSensorsConfig, wrongSensorsConfig, sensorsCount
1010
path = os.getcwd()
1111
logger = configureLogging(path, None)
1212
mainSensorsConfig = 'ZIMonSensors.cfg'

0 commit comments

Comments
 (0)