From 58dead2769f061e95579fedfb953512d6b4af889 Mon Sep 17 00:00:00 2001 From: Austin Macdonald Date: Tue, 24 Sep 2024 14:05:41 -0500 Subject: [PATCH] Fixup Test !E when None --- src/con_duct/__main__.py | 4 ++-- test/test_formatter.py | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/con_duct/__main__.py b/src/con_duct/__main__.py index 14d2a348..b8e0ff48 100644 --- a/src/con_duct/__main__.py +++ b/src/con_duct/__main__.py @@ -557,8 +557,8 @@ def convert_field(self, value, conversion): return self.color_word(self.NONE, self.RED) elif conversion == "E": # colored non-zero is bad return self.color_word( - value, - self.RED if value else self.GREEN, + value if value is not None else self.NONE, + self.RED if value or value is None else self.GREEN, ) elif conversion == "X": # colored truthy col = self.GREEN if value else self.RED diff --git a/test/test_formatter.py b/test/test_formatter.py index bec53bd8..15fe8ca1 100644 --- a/test/test_formatter.py +++ b/test/test_formatter.py @@ -150,6 +150,10 @@ def test_summary_formatter_E_e2e_colors() -> None: e_zero_applied = formatter.format(e_format_string, **{"e": 0}) assert e_zero_applied == f"test {GREEN_START}0{formatter.RESET_SEQ}" + # # Test Red None + e_none_applied = formatter.format(e_format_string, **{"e": None}) + assert e_none_applied == f"test {RED_START}-{formatter.RESET_SEQ}" + def test_summary_formatter_X_e2e() -> None: formatter = SummaryFormatter()