server+ui: auto-equip on card insertion; reset card views on session change
- _apply_equipped_card() centralizes the post-equip refresh + TERMINAL PROFILE (shared by the /api/command equip branch and auto-equip) - server tracks card_session (bumped on equip and disconnect) and equipping; /api/status exposes connected, card_present, card_session, equipping, auto_equip and is exempt from _CARD_LOCK (pure cached state) - auto-equip is on by default (--no-auto-equip; off with --no-card-init): the presence observer spawns a one-shot worker after insertion, which runs equip under _CARD_LOCK and applies the same refresh; the monitor starts after the startup init so pyscard's initial 'already present' event does not re-equip a fresh session - UI: /api/status polls every 2s (other views stay at 5s); when card_session changes it runs pysimResetCardData() (STK overlay, file tree, events, proactive log, PLI, status) — the same reset as a manual Equip; messages: initializing / press Equip / no card Tests for the observer and auto-equip rules, session bumps, _apply_equipped_card, and the UI state machine. SW cache v91 -> v92.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Tests for the passive PC/SC card-presence observer."""
|
||||
"""Tests for the passive PC/SC card-presence observer and auto-equip state."""
|
||||
|
||||
import sys
|
||||
import types
|
||||
@@ -31,8 +31,14 @@ class TestCardPresenceObserver(unittest.TestCase):
|
||||
S, '_handle_card_disconnect',
|
||||
side_effect=lambda: self.disconnects.append(True))
|
||||
self.patcher.start()
|
||||
self.trigger = mock.patch.object(S, '_auto_equip_trigger')
|
||||
self.trigger_mock = self.trigger.start()
|
||||
self.saved_auto = S._AUTO_EQUIP
|
||||
S._AUTO_EQUIP = True
|
||||
|
||||
def tearDown(self):
|
||||
S._AUTO_EQUIP = self.saved_auto
|
||||
self.trigger.stop()
|
||||
self.patcher.stop()
|
||||
S._server_ref = self.saved_ref
|
||||
|
||||
@@ -40,22 +46,104 @@ class TestCardPresenceObserver(unittest.TestCase):
|
||||
self.observer.update(None, ([], [FakeCard('Test Reader 00 00')]))
|
||||
self.assertFalse(self.server.card_present)
|
||||
self.assertEqual(len(self.disconnects), 1)
|
||||
self.trigger_mock.assert_not_called()
|
||||
|
||||
def test_removal_of_other_reader_ignored(self):
|
||||
self.observer.update(None, ([], [FakeCard('Other Reader 00 00')]))
|
||||
self.assertTrue(self.server.card_present)
|
||||
self.assertEqual(self.disconnects, [])
|
||||
self.trigger_mock.assert_not_called()
|
||||
|
||||
def test_insertion_sets_card_present(self):
|
||||
def test_insertion_sets_card_present_and_triggers_auto_equip(self):
|
||||
self.server.card_present = False
|
||||
self.observer.update(None, ([FakeCard('Test Reader 00 00')], []))
|
||||
self.assertTrue(self.server.card_present)
|
||||
self.assertEqual(self.disconnects, [])
|
||||
self.trigger_mock.assert_called_once()
|
||||
|
||||
def test_insertion_does_not_trigger_when_disabled(self):
|
||||
S._AUTO_EQUIP = False
|
||||
self.server.card_present = False
|
||||
self.observer.update(None, ([FakeCard('Test Reader 00 00')], []))
|
||||
self.assertTrue(self.server.card_present)
|
||||
self.trigger_mock.assert_not_called()
|
||||
|
||||
def test_missing_reader_attribute_is_ignored(self):
|
||||
self.observer.update(None, ([], [types.SimpleNamespace()]))
|
||||
self.assertTrue(self.server.card_present)
|
||||
self.assertEqual(self.disconnects, [])
|
||||
self.trigger_mock.assert_not_called()
|
||||
|
||||
|
||||
class TestAutoEquipTrigger(unittest.TestCase):
|
||||
def tearDown(self):
|
||||
S._AUTO_EQUIP = True
|
||||
S._AUTO_EQUIP_BUSY = False
|
||||
|
||||
def test_disabled_does_not_spawn(self):
|
||||
S._AUTO_EQUIP = False
|
||||
with mock.patch.object(S.threading, 'Thread') as thread:
|
||||
S._auto_equip_trigger()
|
||||
thread.assert_not_called()
|
||||
|
||||
def test_busy_does_not_spawn_twice(self):
|
||||
S._AUTO_EQUIP = True
|
||||
S._AUTO_EQUIP_BUSY = True
|
||||
with mock.patch.object(S.threading, 'Thread') as thread:
|
||||
S._auto_equip_trigger()
|
||||
thread.assert_not_called()
|
||||
|
||||
def test_spawns_worker_once(self):
|
||||
S._AUTO_EQUIP = True
|
||||
S._AUTO_EQUIP_BUSY = False
|
||||
with mock.patch.object(S.threading, 'Thread') as thread:
|
||||
S._auto_equip_trigger()
|
||||
thread.assert_called_once_with(target=S._auto_equip_worker, name='auto-equip', daemon=True)
|
||||
|
||||
|
||||
class TestCardSession(unittest.TestCase):
|
||||
def test_disconnect_bumps_session_and_clears_equipping(self):
|
||||
server = types.SimpleNamespace(
|
||||
card_session=5, card=object(), scc=object(), stk_pending=object(),
|
||||
menu_active=True, event_list=[1], sim_menu={}, equipping=True)
|
||||
saved = S._server_ref
|
||||
S._server_ref = server
|
||||
try:
|
||||
S._handle_card_disconnect()
|
||||
finally:
|
||||
S._server_ref = saved
|
||||
self.assertEqual(server.card_session, 6)
|
||||
self.assertFalse(server.equipping)
|
||||
self.assertIsNone(server.card)
|
||||
|
||||
|
||||
class TestApplyEquippedCard(unittest.TestCase):
|
||||
def test_updates_state_and_bumps_session(self):
|
||||
scc = types.SimpleNamespace(cat_cla=None)
|
||||
card = types.SimpleNamespace(_scc=scc, name='Card')
|
||||
app = types.SimpleNamespace(card=card)
|
||||
server = types.SimpleNamespace(
|
||||
app=app, card=None, scc=None, stk_pending=object(), menu_active=True,
|
||||
event_list=[1], sim_menu={}, card_session=2, card_present=False,
|
||||
equipping=False, terminal_profile='7F')
|
||||
saved_ref, saved_conn = S._server_ref, S._CARD_CONNECTED
|
||||
S._server_ref = server
|
||||
S._CARD_CONNECTED = False
|
||||
try:
|
||||
with mock.patch.object(S, '_send_terminal_profile', return_value=('menu', ['ev'])):
|
||||
with mock.patch.object(S, '_poll_enable'):
|
||||
S._apply_equipped_card(server)
|
||||
connected_after = S._CARD_CONNECTED
|
||||
finally:
|
||||
S._server_ref = saved_ref
|
||||
S._CARD_CONNECTED = saved_conn
|
||||
self.assertTrue(connected_after)
|
||||
self.assertIs(server.card, card)
|
||||
self.assertIs(server.scc, scc)
|
||||
self.assertEqual(server.card_session, 3)
|
||||
self.assertTrue(server.card_present)
|
||||
self.assertEqual(server.sim_menu, 'menu')
|
||||
self.assertEqual(server.event_list, ['ev'])
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
Reference in New Issue
Block a user