fix #580

bumble/smp.py

@@ -1839,7 +1839,7 @@ class Session:
         if self.is_initiator:
             if self.pairing_method == PairingMethod.OOB:
                 self.send_pairing_random_command()
-            else:
+            elif self.pairing_method == PairingMethod.PASSKEY:
                 self.send_pairing_confirm_command()
         else:
             if self.pairing_method == PairingMethod.PASSKEY:

bumble/transport/common.py

@@ -370,11 +370,13 @@ class PumpedPacketSource(ParserSource):
                     self.parser.feed_data(packet)
                 except asyncio.CancelledError:
                     logger.debug('source pump task done')
-                    self.terminated.set_result(None)
+                    if not self.terminated.done():
+                        self.terminated.set_result(None)
                     break
                 except Exception as error:
                     logger.warning(f'exception while waiting for packet: {error}')
-                    self.terminated.set_exception(error)
+                    if not self.terminated.done():
+                        self.terminated.set_exception(error)
                     break
 
         self.pump_task = asyncio.create_task(pump_packets())

tests/gatt_test.py

@@ -851,12 +851,7 @@ async def test_unsubscribe():
     await async_barrier()
     mock1.assert_called_once_with(ANY, True, False)
 
-    assert len(server.gatt_server.subscribers) == 1
-
-    def callback(_):
-        pass
-
-    await c2.subscribe(callback)
+    await c2.subscribe()
     await async_barrier()
     mock2.assert_called_once_with(ANY, True, False)
 
@@ -866,16 +861,10 @@ async def test_unsubscribe():
     mock1.assert_called_once_with(ANY, False, False)
 
     mock2.reset_mock()
-    await c2.unsubscribe(callback)
+    await c2.unsubscribe()
     await async_barrier()
     mock2.assert_called_once_with(ANY, False, False)
 
-    # All CCCDs should be zeros now
-    assert list(server.gatt_server.subscribers.values())[0] == {
-        c1.handle: bytes([0, 0]),
-        c2.handle: bytes([0, 0]),
-    }
-
     mock1.reset_mock()
     await c1.unsubscribe()
     await async_barrier()