Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tag alignment in plain text output of report and aggregate command #447

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions tests/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,24 @@ def test_report_invalid_date(runner, watson, test_dt):
assert result.exit_code != 0


@pytest.mark.parametrize('cmd', [cli.report, cli.aggregate])
def test_tag_alignment(runner, watson, cmd):
data = [
('foo', 4000, 4020, ['A']),
('foo', 5000, 49000, ['B' * 10]),
('foo', 50000, 54000, ['C' * 20]),
('foo', 55000, 56000, ['D' * 30]),
]
for name, start, end, tags in data:
watson.frames.add(name, start, end, tags)
result = runner.invoke(cmd,
['-f', '1970-01-01', '-t', '1970-01-01'],
obj=watson)
lines = result.output.split('\n')
tag_line_lengths = [len(line) for line in lines if line.startswith('\t[')]
assert min(tag_line_lengths) == max(tag_line_lengths)


# watson stop

@pytest.mark.parametrize('at_dt', VALID_TIMES_DATA)
Expand Down
2 changes: 1 addition & 1 deletion watson/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ def _final_print(lines):

tags = project['tags']
if tags:
longest_tag = max(len(tag) for tag in tags or [''])
longest_tag = max(len(tag['name']) for tag in tags)

for tag in tags:
_print('\t[{tag} {time}]'.format(
Expand Down