Fix Contract test for resources with one createOnly Property (#520)

* Fix Contract test for resources with one createOnly Property

* Use failed_event

* Check both the error code and  message

Author: anshikg

src/rpdk/core/contract/suite/contract_asserts.py

@@ -1,8 +1,11 @@
 from functools import wraps
 from inspect import Parameter, signature
+from unittest.test.testmock.support import is_instance
 
 import pytest
 
+from rpdk.core.contract.interface import HandlerErrorCode
+
 
 def _rebind(decorator, func, *args, **kwargs):
     """Helper function to construct decorated arguments
@@ -120,10 +123,12 @@ def failed_event(error_code, msg=""):
     def decorator_wrapper(func: object):
         @wraps(func)
         def wrapper(*args, **kwargs):
-            response = func(*args, **kwargs)
-            if response is not None:
-                assert response == error_code, msg
-            return response
+            response_error = func(*args, **kwargs)
+            if response_error is not None:
+                if is_instance(error_code, HandlerErrorCode):
+                    error_code_tuple = (error_code,)
+                assert response_error in error_code_tuple, msg
+            return response_error
 
         return wrapper
 

src/rpdk/core/contract/suite/handler_update_invalid.py

@@ -10,6 +10,7 @@
 
 
 @pytest.mark.update
+@failed_event(error_code=(HandlerErrorCode.NotUpdatable, HandlerErrorCode.NotFound))
 def contract_update_create_only_property(resource_client):
 
     if resource_client.create_only_paths:
@@ -22,13 +23,10 @@ def contract_update_create_only_property(resource_client):
             update_request = resource_client.generate_invalid_update_example(
                 created_model
             )
-            _status, response, _error = resource_client.call_and_assert(
+            _status, response, _error_code = resource_client.call_and_assert(
                 Action.UPDATE, OperationStatus.FAILED, update_request, created_model
             )
             assert response["message"]
-            assert (
-                _error == HandlerErrorCode.NotUpdatable
-            ), "updating readOnly or createOnly properties should not be possible"
         finally:
             resource_client.call_and_assert(
                 Action.DELETE, OperationStatus.SUCCESS, created_model