From 9f20ab9a782deb990cb6b86d9b08cbc924a7496e Mon Sep 17 00:00:00 2001 From: Marc Abramowitz Date: Wed, 12 Apr 2017 12:13:51 -0700 Subject: [PATCH] node: Allow showing non-lowercase fields (#957) --- cli/dcoscli/tables.py | 2 +- cli/tests/integrations/test_node.py | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cli/dcoscli/tables.py b/cli/dcoscli/tables.py index 8de99af..b08c866 100644 --- a/cli/dcoscli/tables.py +++ b/cli/dcoscli/tables.py @@ -894,7 +894,7 @@ def node_table(nodes, field_names=()): heading, field_name = field_name.split(':', 1) else: heading = field_name - fields[heading.upper()] = _dotted_itemgetter(field_name.lower()) + fields[heading.upper()] = _dotted_itemgetter(field_name) sortby = list(fields.keys())[0] tb = table(fields, nodes, sortby=sortby) diff --git a/cli/tests/integrations/test_node.py b/cli/tests/integrations/test_node.py index 29c2aff..b0a9d46 100644 --- a/cli/tests/integrations/test_node.py +++ b/cli/tests/integrations/test_node.py @@ -57,6 +57,17 @@ def test_node_table_field_option(): assert lines[0].split() == ['HOSTNAME', 'IP', 'ID', 'TYPE', 'DISK_USED'] +def test_node_table_uppercase_field_option(): + returncode, stdout, stderr = exec_command( + ['dcos', 'node', '--field=TASK_RUNNING']) + + assert returncode == 0 + assert stderr == b'' + lines = stdout.decode('utf-8').splitlines() + assert len(lines) > 2 + assert lines[0].split() == ['HOSTNAME', 'IP', 'ID', 'TYPE', 'TASK_RUNNING'] + + def test_node_log_empty(): stderr = b"You must choose one of --leader or --mesos-id.\n" assert_command(['dcos', 'node', 'log'], returncode=1, stderr=stderr)