adjust tests for accuracy

Author: 2bndy5

.cspell.config.yml

@@ -38,3 +38,4 @@ words:
   - spidev
   - testpaths
   - urandom
+  - xfer

tests/conftest.py

@@ -2,7 +2,7 @@
 registers in a dict."""
 
 import logging
-from typing import Union, Tuple
+from typing import Union, Tuple, List
 import pytest
 from circuitpython_nrf24l01.rf24 import (
     RF24,
@@ -54,8 +54,8 @@ class RadioState:
     }
 
     # SPI commands
-    rx_fifo = []  # command 0x61
-    tx_fifo = []  # commands 0xA0, 0xB0, 0xA8 + pipe number
+    rx_fifo: List[bytearray] = []  # command 0x61
+    tx_fifo: List[bytearray] = []  # commands 0xA0, 0xB0, 0xA8 + pipe number
     logger = logging.getLogger("nRF24L01")
 
     def __init__(self):
@@ -80,6 +80,7 @@ def __init__(self):
     def read_payload(master_out_buf):
         """Read payload from state machine's RX FIFO.
         For simplicity, this doesn't pop payloads from the FIFO."""
+        status_byte = RadioState.registers[7][0]  # copy current STATUS byte
         if RadioState.rx_fifo:
             RadioState.logger.debug(
                 "Requesting %d bytes from the RX FIFO", len(master_out_buf)
@@ -107,21 +108,22 @@ def read_payload(master_out_buf):
                 if len(RadioState.rx_fifo) >= 3:
                     RadioState.registers[0x17][0] |= 2
             return (
-                RadioState.registers[7]
+                bytearray([status_byte])
                 + ret_val[:size]
                 + bytearray(b"." * (len(master_out_buf) - size))
             )
-        return RadioState.registers[7] + (b"." * len(master_out_buf))
+        return bytearray([status_byte]) + (b"." * len(master_out_buf))
 
     @staticmethod
     def write_payload(payload):
         """Write payload to state machine's TX FIFO."""
+        status_byte = RadioState.registers[7][0]  # copy current STATUS byte
         RadioState.tx_fifo.append(payload)
         RadioState.registers[0x17][0] &= 0xCF
         if len(RadioState.tx_fifo) >= 3:
             RadioState.registers[0x17][0] |= 0x20
             RadioState.registers[7][0] |= 1
-        return RadioState.registers[7] + (b"\0" * len(payload))
+        return bytearray([status_byte]) + (b"\0" * len(payload))
 
     @staticmethod
     def get_pl_width(*_):
@@ -138,20 +140,22 @@ def non_op(*_):
     @staticmethod
     def flush_tx(*_):
         """Flush the state machine's TX FIFO."""
+        status_byte = RadioState.registers[7][0]  # copy current STATUS byte
         RadioState.tx_fifo.clear()
         RadioState.registers[7][0] &= 0xFE
         RadioState.registers[0x17][0] &= 0xCF
         RadioState.registers[0x17][0] |= 0x10
-        return RadioState.registers[7]
+        return bytearray([status_byte])
 
     @staticmethod
     def flush_rx(*_):
         """Flush the state machine's RX FIFO."""
+        status_byte = RadioState.registers[7][0]  # copy current STATUS byte
         RadioState.rx_fifo.clear()
         RadioState.registers[7][0] |= 0x0E
         RadioState.registers[0x17][0] &= 0xF0
         RadioState.registers[0x17][0] |= 1
-        return RadioState.registers[7]
+        return bytearray([status_byte])
 
     def __getitem__(self, __offset: int) -> bytearray:
         register = __offset & 0x1F
@@ -212,15 +216,17 @@ def xfer2(self, out_buf: Union[bytes, bytearray], baud_rate: int) -> bytearray:
         """A mock function for a full duplex SPI transaction."""
         register = out_buf[0]
         assert baud_rate
+        # copy STATUS register before outcome alters it
+        status_byte = self.state.registers[7]
         try:  # assume `register` is a write operation
             self.state[register] = bytearray(out_buf[1:])
-            return self.state.registers[7]
+            return status_byte
         except RegisterReadOnly:  # `register` is a SPI read operation
             return self.state[register]
         except RegisterError:  # `register` is a SPI command
             if register in self.state.commands:
                 return self.state.commands[register](out_buf[1:])
-            return self.state.registers[7]
+            return status_byte
 
 
 class ShimDigitalIO:

tests/test_rf24.py

@@ -26,7 +26,7 @@ def test_context(rf24_obj: RF24, ble_obj: FakeBLE):
 
 
 @pytest.mark.parametrize("value", [True, False])
-def test_ce(rf24_obj: RF24, value: False):
+def test_ce(rf24_obj: RF24, value: bool):
     """test ce_pin attribute."""
     rf24_obj.ce_pin = value
     assert rf24_obj.ce_pin == value
@@ -156,7 +156,7 @@ def test_dyn_pl_attr(rf24_obj: RF24):
     """test dynamic_payloads attribute (using list of integers)."""
     enable = [1, -1, 0, 1]
     previous = rf24_obj.dynamic_payloads & enable.index(-1)
-    rf24_obj.dynamic_payloads = enable
+    rf24_obj.dynamic_payloads = enable  # type: ignore[assignment]
     for i, pipe in enumerate(enable):
         if pipe < 0:
             assert rf24_obj.get_dynamic_payloads(i) == previous
@@ -177,7 +177,7 @@ def test_payload_length_attr(rf24_obj: RF24):
     """test payload_length attribute (using list of integers)."""
     enable = [1, -1, 20, 0]
     previous = rf24_obj.payload_length
-    rf24_obj.payload_length = enable
+    rf24_obj.payload_length = enable  # type: ignore[assignment]
     for i, pipe in enumerate(enable):
         if pipe <= 0:
             assert rf24_obj.get_payload_length(i) == previous
@@ -198,7 +198,7 @@ def test_auto_ack_attr(rf24_obj: RF24):
     """test auto_ack attribute (using list of integers)."""
     enable = [1, -1, 20, 0]
     previous = bool(rf24_obj.auto_ack & (enable.index(-1)))
-    rf24_obj.auto_ack = enable
+    rf24_obj.auto_ack = enable  # type: ignore[assignment]
     for i, pipe in enumerate(enable):
         if pipe < 0:
             assert rf24_obj.get_auto_ack(i) == previous