From f8dbe754f7996baa3a5554b4f4c8ae6be28dc02f Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Thu, 29 Aug 2024 17:10:04 -0700 Subject: [PATCH] Fix test_dtcs and test_cross skipping This test has been wrong for a long time, basically never properly asserting DTCS values for drivers. The three drivers fixed immediately before this commit should have been caught by this test, but were not because it was always skipping the dtcs field. Related to #11506 --- tests/base.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/base.py b/tests/base.py index 093bedef0..c2033aa79 100644 --- a/tests/base.py +++ b/tests/base.py @@ -174,15 +174,16 @@ def assertEqualMem(self, a, b, ignore=None): (a.tmode == "Cross" and rx_mode == "Tone"))): continue - elif k == "dtcs" and not ( - (a.tmode == "DTCS" and not self.rf.has_rx_dtcs) or - (a.tmode == "Cross" and tx_mode == "DTCS") or - (a.tmode == "Cross" and rx_mode == "DTCS" and - not self.rf.has_rx_dtcs)): + elif k == "dtcs" and (a.tmode != 'DTCS' or + (a.tmode == 'Cross' and tx_mode != 'DTCS')): + # If we are not in a tmode where a transmit DTCS code is + # required, we do not care if the code is persisted. continue elif k == "rx_dtcs" and (not self.rf.has_rx_dtcs or not (a.tmode == "Cross" and rx_mode == "DTCS")): + # If we are not in a tmode where a receive DTCS code is + # required, we do not care if the code is persisted. continue elif k == "offset" and not a.duplex: continue