Reworked guard logic.

zigpy · Feb 12, 2018 · 01341fa · 01341fa
1 parent a3b643b
commit 01341fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/bellows/uart.py b/bellows/uart.py
@@ -126,7 +126,7 @@ def rstack_frame_received(self, data):
             return
 
         # Make sure that the reset_future is not done
-        if self._reset_future.done() is not True:
+        if not self._reset_future.done():
             self._reset_future.set_result(True)
 
     def error_frame_received(self, data):

diff --git a/tests/test_uart.py b/tests/test_uart.py
@@ -105,7 +105,9 @@ def test_rst_frame_received(gw):
 
 def test_rstack_frame_received(gw):
     gw._reset_future = mock.MagicMock()
+    gw._reset_future.done = mock.MagicMock(return_value=False)
     gw.data_received(b'\xc1\x02\x0b\nR\x7e')
+    assert gw._reset_future.done.call_count == 1
     assert gw._reset_future.set_result.call_count == 1
 
 
@@ -125,6 +127,14 @@ def test_rstack_frame_received_nofut(gw):
     gw.data_received(b'\xc1\x02\x0b\nR\x7e')
 
 
+def test_rstack_frame_received_out_of_order(gw):
+    gw._reset_future = mock.MagicMock()
+    gw._reset_future.done = mock.MagicMock(return_value=True)
+    gw.data_received(b'\xc1\x02\x0b\nR\x7e')
+    assert gw._reset_future.done.call_count == 1
+    assert gw._reset_future.set_result.call_count == 0
+
+
 def test_error_frame_received(gw):
     gw.frame_received(bytes([0b11000010]))