diff options
| author |   Miroslav Los <miroslav.los@pantheon.tech> | 2019-11-15 09:20:09 +0100 |
|---|---|---|
| committer | Miroslav Los <miroslav.los@pantheon.tech> | 2019-11-15 09:24:54 +0100 |
| commit | 7e1f8a90d2fd18a5169cea04b6bb53dd9288092e (patch) | |
| tree | 5c089d095b07c11d4b9c3929a7a35b9774df8f81 | |
| parent | 18673c56f47a3662ef8b0b981a9af774e2e29826 (diff) | |
Fix minor issues revealed by pylint
Remove superfluous argument to str.format in dmaap.
Fix two tests with the same name in dnsdesig.
Raise a proper exception instead of bool in helm.
Signed-off-by: Miroslav Los <miroslav.los@pantheon.tech>
Issue-ID: CCSDK-1928
Change-Id: I07ff9eaa3b25a4c7864eda2b6189d7357c887dd4
| -rw-r--r-- | dmaap/dmaapplugin/dr_relationships.py | 2 | ||||
| -rw-r--r-- | dnsdesig/tests/test_plugin.py | 2 | ||||
| -rw-r--r-- | helm/plugin/tasks.py | 2 |
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): |