提交 4a05fd60 编写于 作者: L Lukáš Doktor

optional_plugins.varianter_cit: Use built-in varianter.to_str

There was a minor bug/inconsistency in "to_str" method where
"self.parameter_path" is returned instead of list of leaves. Instead of
fixing it let's use the built-in "varianter.to_str" which uses the
"usual" implementation.
Signed-off-by: NLukáš Doktor <ldoktor@redhat.com>
上级 6020ccd3
......@@ -23,6 +23,7 @@ from six.moves import configparser
from six.moves import zip
from avocado.core import exit_codes
from avocado.core import varianter
from avocado.core.output import LOG_UI
from avocado.core.plugin_interfaces import CLI
from avocado.core.plugin_interfaces import Varianter
......@@ -138,27 +139,14 @@ class VarianterCit(Varianter):
"""
if not self.variants:
return ""
out = []
verbose = variants > 1
out.append("CIT Variants (%i):" % len(self))
for variant in self:
out.append('%sVariant %s: %s' % ('\n' if verbose else '',
variant["variant_id"],
self.parameter_path))
if not verbose:
continue
env = set()
for node in variant["variant"]:
for key, value in iteritems(node.environment):
origin = node.environment.origin[key].path
env.add(("%s:%s" % (origin, key), str(value)))
if not env:
return out
fmt = ' %%-%ds => %%s' % max([len(_[0]) for _ in env])
for record in sorted(env):
out.append(fmt % record)
if variants:
# variants == 0 means disable, but in plugin it's brief
out.append("CIT Variants (%s):" % len(self))
for variant in self:
out.extend(varianter.variant_to_str(variant, variants - 1,
kwargs, False))
return "\n".join(out)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册