Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Issue #412 - Created test exception
  • Loading branch information
rakillen committed Nov 12, 2019
commit 1312d0da427afa87f1e6a00d58e4b06a56b2b761
10 changes: 10 additions & 0 deletions core/src/test/python/attributes_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ def testAttributeNames(self):
# This test ensures that the attribute names match the WLST offline attribute names in 12.2.1.3.
#
def _check_folder(self, name, location, aliases):
if not is_wlst_location(location):
return

wlst_name = aliases.get_wlst_mbean_type(location)

if wlst_name is None:
Expand Down Expand Up @@ -103,5 +106,12 @@ def _is_filtered_folder(self, name, location):
result = True
return result


def is_wlst_location(location):
if location.get_folder_path() == '/ODLConfiguration':
return False
return True


if __name__ == '__main__':
unittest.main()
4 changes: 4 additions & 0 deletions core/src/test/python/attributes_type_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from wlsdeploy.aliases.wlst_modes import WlstModes
from wlsdeploy.aliases.location_context import LocationContext
from wlsdeploy.util.model_context import ModelContext
import attributes_test


class AttributesTypeTestCase(unittest.TestCase):
Expand All @@ -34,6 +35,9 @@ def testDelimitedAttributes(self):
self._check_folder(location, aliases)

def _check_folder(self, location, aliases):
if not attributes_test.is_wlst_location(location):
return

wlst_name = aliases.get_wlst_mbean_type(location)
if wlst_name is None:
# folders added since 12.2.1.3 are not in the alias structure.
Expand Down