summaryrefslogtreecommitdiffstats
path: root/cdap/cdapplugin/tests/test_discovery.py
diff options
context:
space:
mode:
authorTommy Carpenter <tommy@research.att.com>2017-09-14 21:54:32 -0400
committerTommy Carpenter <tommy@research.att.com>2017-09-14 21:57:03 -0400
commit770b47da0f4a33b22d757510c9108f30d6cbbd51 (patch)
tree5b0100b12902fefe23dc4ad4940fc08396b39deb /cdap/cdapplugin/tests/test_discovery.py
parent289fbe75c0a172bf69adabc2ffd48c3b5958d363 (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_discovery.py')
-rw-r--r--cdap/cdapplugin/tests/test_discovery.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/cdap/cdapplugin/tests/test_discovery.py b/cdap/cdapplugin/tests/test_discovery.py
index 7ee59c4..7354f4e 100644
--- a/cdap/cdapplugin/tests/test_discovery.py
+++ b/cdap/cdapplugin/tests/test_discovery.py
@@ -63,7 +63,7 @@ def test_put_broker(monkeypatch):
"test_se",
"test_p",
"test_pp",
- logger)
+ logger = logger)
assert R.text == "URL: http://666.666.666.666:666/application/test_scn, headers {'content-type': 'application/json'}"
assert R.json == {'app_preferences': 'test_ap', 'services': 'test_se', 'namespace': 'test_ns', 'programs': 'test_p', 'cdap_application_type': 'program-flowlet', 'app_config': 'test_ac', 'streamname': 'test_sn', 'program_preferences': 'test_pp', 'artifact_name': 'test_an', 'jar_url': 'test_ju', 'artifact_version': 'test_av'}
@@ -77,7 +77,7 @@ def test_reconfigure_in_broker(monkeypatch):
_TEST_SCN,
{"redome" : "baby"},
"program-flowlet-app-config",
- logger)
+ logger = logger)
assert R.text == "URL: http://666.666.666.666:666/application/test_scn/reconfigure, headers {'content-type': 'application/json'}"
assert R.json == {'reconfiguration_type': 'program-flowlet-app-config', 'config': {'redome': 'baby'}}
assert R.status_code == 200
@@ -88,8 +88,7 @@ def test_delete_on_broker(monkeypatch):
R = discovery.delete_on_broker(
_TEST_BROKER_NAME,
_TEST_SCN,
- logger)
- print(R.text)
+ logger = logger)
assert R.text == "URL: http://666.666.666.666:666/application/test_scn"
assert R.status_code == 200
@@ -108,7 +107,7 @@ def test_multi_delete(monkeypatch):
monkeypatch.setattr('requests.post', _fake_putpost)
R = discovery.delete_all_registered_apps(
_TEST_BROKER_NAME,
- logger)
+ logger = logger)
assert R.text == "URL: http://666.666.666.666:666/application/delete, headers {'content-type': 'application/json'}"
assert R.status_code == 200