Fixes for compareModel unit tests (#612)

* Initialize summary handler for compare-model and validate unit tests; suppress stack traces in compare-model tests

* Initialize summary handler for compare-model and validate unit tests; suppress stack traces in compare-model tests

Author: rakillen

core/src/test/python/compare_model_test.py

@@ -4,24 +4,37 @@
 """
 import unittest
 
-import os, tempfile, traceback, sys, shutil
+import os
+import shutil
+import tempfile
+from java.util.logging import Level
+from oracle.weblogic.deploy.compare import CompareException
+from oracle.weblogic.deploy.logging import SummaryHandler
+from oracle.weblogic.deploy.util import PyWLSTException
 
-from wlsdeploy.util.model_context import ModelContext
 from compare_model import ModelFileDiffer
-from wlsdeploy.util.model_translator import FileToPython
 from wlsdeploy.logging.platform_logger import PlatformLogger
-from oracle.weblogic.deploy.compare import CompareException
-from oracle.weblogic.deploy.util import PyWLSTException
+from wlsdeploy.util.model_context import ModelContext
+from wlsdeploy.util.model_translator import FileToPython
+
 
 class CompareModelTestCase(unittest.TestCase):
     _resources_dir = '../../test-classes'
     _use_ordering = True
 
     def setUp(self):
         self.name = 'CompareModelTestCase'
-        self._logger = PlatformLogger('wlsdeploy.comparemodel')
+        self._logger = PlatformLogger('wlsdeploy.compare_model')
         self._program_name = 'CompareModelTestCase'
 
+        # add summary handler to validate logger to check results
+        self._summary_handler = SummaryHandler()
+        PlatformLogger('wlsdeploy.validate').logger.addHandler(self._summary_handler)
+
+    def tearDown(self):
+        # remove summary handler for next test suite
+        PlatformLogger('wlsdeploy.validate').logger.removeHandler(self._summary_handler)
+
     def testCompareModelFull(self):
         _method_name = 'testCompareModelFull'
 
@@ -119,9 +132,8 @@ def testCompareModelInvalidModel(self):
             return_code = obj.compare()
         except (CompareException, PyWLSTException), te:
             return_code = 2
-            self._logger.severe('WLSDPLY-05709',
-                                te.getLocalizedMessage(), error=te,
-                                class_name=self._program_name, method_name=_method_name)
+            # self._logger.severe('WLSDPLY-05709', te.getLocalizedMessage(), error=te,
+            #                     class_name=self._program_name, method_name=_method_name)
 
         if os.path.exists(_temp_dir):
             shutil.rmtree(_temp_dir)
@@ -152,12 +164,26 @@ def testCompareModelInvalidFile(self):
         try:
             model_context = ModelContext('CompareModelTestCase', args_map)
             obj = ModelFileDiffer(_new_model_file, _old_model_file, model_context, _temp_dir)
+
+            # expected parse error for model4, disable logging
+            yaml_logger = PlatformLogger('wlsdeploy.yaml')
+            yaml_level = yaml_logger.get_level()
+            yaml_logger.set_level(Level.OFF)
+
+            compare_logger = PlatformLogger('wlsdeploy.compare_model')
+            compare_level = compare_logger.get_level()
+            compare_logger.set_level(Level.OFF)
+
             return_code = obj.compare()
+
+            # Restore original log levels
+            yaml_logger.set_level(yaml_level)
+            compare_logger.set_level(compare_level)
+
         except (CompareException, PyWLSTException), te:
             return_code = 2
-            self._logger.severe('WLSDPLY-05709',
-                                te.getLocalizedMessage(), error=te,
-                                class_name=self._program_name, method_name=_method_name)
+            # self._logger.severe('WLSDPLY-05709', te.getLocalizedMessage(), error=te,
+            #                     class_name=self._program_name, method_name=_method_name)
 
         if os.path.exists(_temp_dir):
             shutil.rmtree(_temp_dir)

core/src/test/python/validation_test.py

@@ -36,7 +36,14 @@ def setUp(self):
         self.name = 'ValidationTestCase'
         self._logger = PlatformLogger('wlsdeploy.validate')
         self.wls_helper = WebLogicHelper(self._logger)
-        self._logger.logger.addHandler(SummaryHandler())
+
+        # add summary handler to validate logger to check results
+        self._summary_handler = SummaryHandler()
+        self._logger.logger.addHandler(self._summary_handler)
+
+    def tearDown(self):
+        # remove summary handler for next test suite
+        self._logger.logger.removeHandler(self._summary_handler)
 
     def testModelValidation(self):
         _method_name = 'testModelValidation'