summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dmaap/dmaapplugin/dr_relationships.py2
-rw-r--r--dnsdesig/tests/test_plugin.py2
-rw-r--r--helm/plugin/tasks.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/dmaap/dmaapplugin/dr_relationships.py b/dmaap/dmaapplugin/dr_relationships.py
index 2f342f3..4c955f2 100644
--- a/dmaap/dmaapplugin/dr_relationships.py
+++ b/dmaap/dmaapplugin/dr_relationships.py
@@ -107,7 +107,7 @@ def delete_dr_publisher(**kwargs):
# Get the publisher id
target_feed = ctx.target.node.id
publisher_id = ctx.source.instance.runtime_properties[target_feed]["publisher_id"]
- ctx.logger.info("Attempting to delete publisher {0}".format(publisher_id, target_feed))
+ ctx.logger.info("Attempting to delete publisher {0}".format(publisher_id))
# Make the request
dmc = DMaaPControllerHandle(DMAAP_API_URL, DMAAP_USER, DMAAP_PASS, ctx.logger)
diff --git a/dnsdesig/tests/test_plugin.py b/dnsdesig/tests/test_plugin.py
index d2b9174..78b3483 100644
--- a/dnsdesig/tests/test_plugin.py
+++ b/dnsdesig/tests/test_plugin.py
@@ -372,7 +372,7 @@ def test_dns_delcname():
dnsdesig.dns_plugin.cnamenotneeded()
@_setup(_goodos, 'noservice.x.example.com')
-def test_dns_delcname():
+def test_dns_delbadcname():
with pytest.raises(RecoverableError):
dnsdesig.dns_plugin.cnamenotneeded()
diff --git a/helm/plugin/tasks.py b/helm/plugin/tasks.py
index ac27764..be59472 100644
--- a/helm/plugin/tasks.py
+++ b/helm/plugin/tasks.py
@@ -168,7 +168,7 @@ def str_to_bool(s):
elif s == 'False' or s == 'false':
return False
else:
- raise False
+ raise ValueError('Require [Tt]rue or [Ff]alse; got: {0}'.format(s))
def get_config_json(config_json, config_path, config_opt_f, config_file_nm):