Skip to content

Commit 1341300

Browse files
committed
cleanup unit test errors
1 parent 3ecb63c commit 1341300

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/CoherenceClusterSystemResource.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"Notes": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string"} ],
2020
"RuntimeCacheConfigurationUri": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "RuntimeCacheConfigurationUri", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string"} ],
2121
"Target": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "Target", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "delimited_string" },
22-
{"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "value": {"default": "None"}, "wlst_type": "jarray", "preferred_model_type": "delimited_string"\, "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ]
22+
{"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "value": {"default": "None"}, "wlst_type": "jarray", "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ]
2323
},
2424
"wlst_attributes_path": "WP001",
2525
"wlst_paths": {

core/src/test/python/variables_test.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
from oracle.weblogic.deploy.util import VariableException
1111
from wlsdeploy.util.model_context import ModelContext
1212
from wlsdeploy.util.model_translator import FileToPython
13-
13+
from wlsdeploy.logging import platform_logger
14+
from java.util.logging import Level
1415

1516
class VariablesTestCase(unittest.TestCase):
1617
_resources_dir = '../../test-classes'
@@ -148,11 +149,17 @@ def testTokenSyntaxErrors(self):
148149
"""
149150
Test that exceptions are thrown for token syntax errors.
150151
"""
152+
# Temporarily disable logging for this test. Each test is expected to fail and issue warning messages
153+
logger = platform_logger.PlatformLogger('wlsdeploy.variables')
154+
original_level = logger.get_level()
155+
logger.set_level(Level.OFF)
151156
self._test_token_syntax_error("@@SECRET:my-secret/my-key@@")
152157
self._test_token_syntax_error("@@SECRET:@@ENVmy-secret:-my-key@@-some-more-text")
153158
self._test_token_syntax_error("@@ENV:my-secret!@@")
154159
self._test_token_syntax_error("@@FILE:@@ORACLE_HOME@@/my-file")
155160
self._test_token_syntax_error("@@PROP:")
161+
# Restore original log level
162+
logger.set_level(original_level)
156163

157164
def _test_token_syntax_error(self, value):
158165
"""

0 commit comments

Comments
 (0)