From f18c637c042eec4678a79729a0e67da99017c465 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 21 Jan 2022 20:32:51 +0100 Subject: Merging upstream version 2.2.1. Signed-off-by: Daniel Baumann --- tests/tabular_output/test_output_formatter.py | 12 ++++++++++-- tests/tabular_output/test_preprocessors.py | 6 +++--- 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/tabular_output/test_output_formatter.py b/tests/tabular_output/test_output_formatter.py index d064427..b307c1c 100644 --- a/tests/tabular_output/test_output_formatter.py +++ b/tests/tabular_output/test_output_formatter.py @@ -214,13 +214,21 @@ def test_enforce_iterable(): assert False, "{0} doesn't return iterable".format(format_name) -def test_all_text_type(): +@pytest.mark.parametrize( + "extra_kwargs", + [ + {}, + {"style": "default"}, + {"style": "colorful"}, + ], +) +def test_all_text_type(extra_kwargs): """Test the TabularOutputFormatter class.""" data = [[1, "", None, Decimal(2)]] headers = ["col1", "col2", "col3", "col4"] output_formatter = TabularOutputFormatter() for format_name in output_formatter.supported_formats: for row in output_formatter.format_output( - iter(data), headers, format_name=format_name + iter(data), headers, format_name=format_name, **extra_kwargs ): assert isinstance(row, text_type), "not unicode for {}".format(format_name) diff --git a/tests/tabular_output/test_preprocessors.py b/tests/tabular_output/test_preprocessors.py index efc1b54..e428bfa 100644 --- a/tests/tabular_output/test_preprocessors.py +++ b/tests/tabular_output/test_preprocessors.py @@ -250,9 +250,9 @@ def test_style_output_custom_tokens(): data, headers, style=CliStyle, - header_token="Token.Results.Headers", - odd_row_token="Token.Results.OddRows", - even_row_token="Token.Results.EvenRows", + header_token=Token.Results.Headers, + odd_row_token=Token.Results.OddRows, + even_row_token=Token.Results.EvenRows, ) assert (expected_data, expected_headers) == (list(output[0]), output[1]) -- cgit v1.2.3