diff options
author | Tommy Carpenter <tommy@research.att.com> | 2017-09-14 21:54:32 -0400 |
---|---|---|
committer | Tommy Carpenter <tommy@research.att.com> | 2017-09-14 21:57:03 -0400 |
commit | 770b47da0f4a33b22d757510c9108f30d6cbbd51 (patch) | |
tree | 5b0100b12902fefe23dc4ad4940fc08396b39deb /cdap/cdapplugin/tests/test_cdap_plugin.py | |
parent | 289fbe75c0a172bf69adabc2ffd48c3b5958d363 (diff) |
DRY up code with decorators
Issue-ID: DCAEGEN2-74
Change-Id: Iefdfe3fa60879161ebc6ba3224f342a9af575d94
Signed-off-by: Tommy Carpenter <tommy@research.att.com>
Diffstat (limited to 'cdap/cdapplugin/tests/test_cdap_plugin.py')
-rw-r--r-- | cdap/cdapplugin/tests/test_cdap_plugin.py | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/cdap/cdapplugin/tests/test_cdap_plugin.py b/cdap/cdapplugin/tests/test_cdap_plugin.py index 7434fe8..f28485d 100644 --- a/cdap/cdapplugin/tests/test_cdap_plugin.py +++ b/cdap/cdapplugin/tests/test_cdap_plugin.py @@ -5,9 +5,9 @@ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,59 +17,60 @@ # # ECOMP is a trademark and service mark of AT&T Intellectual Property. -from cdapcloudify.cdap_plugin import _validate_conns, BadConnections +from cdapcloudify.cdap_plugin import _validate_conns, BadConnections, try_raise_nonr import pytest +from cloudify.exceptions import NonRecoverableError #todo.. add more tests.. #shame def _get_good_connection(): connections = {} connections["streams_publishes"] = [ - {"name" : "test_n", + {"name" : "test_n", "location" : "test_l", "client_role" : "test_cr", "type" : "message_router", "config_key" : "test_c", "aaf_username": "test_u", - "aaf_password": "test_p" + "aaf_password": "test_p" }, - {"name" : "test_n2", + {"name" : "test_n2", "location" : "test_l", "client_role" : "test_cr", "type" : "message_router", "config_key" : "test_c", "aaf_username": "test_u", - "aaf_password": "test_p" + "aaf_password": "test_p" }, - {"name" : "test_feed00", + {"name" : "test_feed00", "location" : "test_l", "type" : "data_router", "config_key" : "mydrconfigkey" } ] connections["streams_subscribes"] = [ - {"name" : "test_n", + {"name" : "test_n", "location" : "test_l", "client_role" : "test_cr", "type" : "message_router", "config_key" : "test_c", "aaf_username": "test_u", - "aaf_password": "test_p" + "aaf_password": "test_p" }, - {"name" : "test_n2", + {"name" : "test_n2", "location" : "test_l", "client_role" : "test_cr", "type" : "message_router", "config_key" : "test_c", "aaf_username": "test_u", - "aaf_password": "test_p" + "aaf_password": "test_p" } ] return connections def test_validate_cons(): #test good streams - good_conn = _get_good_connection() + good_conn = _get_good_connection() _validate_conns(good_conn) #mutate @@ -85,3 +86,18 @@ def test_validate_cons(): with pytest.raises(BadConnections) as excinfo: _validate_conns(noloc) +def test_nonr_dec(): + def blow(): + d = {} + d["emptyinside"] += 1 + return d + #apply decorator + blow = try_raise_nonr(blow) + with pytest.raises(NonRecoverableError): + blow() + + def work(): + return 666 + work = try_raise_nonr(work) + assert work() == 666 + |