Commit d352b796 authored by Helga Velroyen's avatar Helga Velroyen
Browse files

Revert "QA: Make Query tests test for '?' values"

This reverts commit
bfbef99b

. The problem is that
in some cases it makes sense for '?' to be displayed. This
is the case for storage reporting on clusters that have only
the 'diskless' disk template enabled. It would be nicer,
if a '-' would be displayed in those cases, but this is a
bigger change in the haskell query infrastructure. Thus,
I am reverting this for now and send a follow up patch in
the next days.
Signed-off-by: default avatarHelga Velroyen <helgav@google.com>
Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
parent 7af293d7
......@@ -514,22 +514,7 @@ def _List(listcmd, fields, names):
utils.ShellQuoteArgs(cmd)).splitlines()
def _AssertListNoUnknownValues(listcmd, fields):
"""Assert that the list command does not output unknown values.
"""
master = qa_config.GetMasterNode()
cmd = [listcmd, "list", "--output", ",".join(fields)]
output = GetCommandOutput(master.primary,
utils.ShellQuoteArgs(cmd)).splitlines()
for line in output:
AssertNotIn('?', line)
def GenericQueryTest(cmd, fields, namefield="name", test_unknown=True,
test_values_unknown=True):
def GenericQueryTest(cmd, fields, namefield="name", test_unknown=True):
"""Runs a number of tests on query commands.
@param cmd: Command name
......@@ -565,9 +550,6 @@ def GenericQueryTest(cmd, fields, namefield="name", test_unknown=True,
AssertCommand([cmd, "list", "this.name.certainly.does.not.exist"],
fail=True)
if test_values_unknown:
_AssertListNoUnknownValues(cmd, fields)
# Check exit code for listing unknown field
AssertEqual(AssertRedirectedCommand([cmd, "list",
"--output=field/does/not/exist"],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment