From fc909fa93d6777fde7f89a06081c1952a8578e6a Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Fri, 3 Mar 2023 00:50:30 +0100 Subject: [PATCH] Reset device on test_cid_0 Signed-off-by: Pol Henarejos --- tests/pico-fido/test_055_hid.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/tests/pico-fido/test_055_hid.py b/tests/pico-fido/test_055_hid.py index 345440c..8cb6d46 100644 --- a/tests/pico-fido/test_055_hid.py +++ b/tests/pico-fido/test_055_hid.py @@ -174,7 +174,7 @@ class TestHID(object): def test_check_busy(self, device): t1 = time.time() * 1000 device.send_data(CTAPHID.INIT, "\x11\x22\x33\x44\x55\x66\x77\x88") - oldcid = device.cid() + oldcid = device.cid().to_bytes(4, 'big') newcid = b"\x11\x22\x33\x44" device.send_raw("\x81\x04\x00") device.set_cid(newcid) @@ -185,11 +185,6 @@ class TestHID(object): assert cmd == 0xBF assert r[0] == CtapError.ERR.CHANNEL_BUSY - device.set_cid(oldcid) - cmd, r = device.recv_raw() # timeout response - assert cmd == 0xBF - assert r[0] == CtapError.ERR.TIMEOUT - def test_check_busy_interleaved(self, device): cid1 = b"\x11\x22\x33\x44" cid2 = b"\x01\x22\x33\x44" @@ -220,25 +215,26 @@ class TestHID(object): assert len(r) == 0x39 def test_cid_0(self, device): - device.set_cid("\x00\x00\x00\x00") + device.reset() + device.set_cid(b"\x00\x00\x00\x00") device.send_raw( "\x86\x00\x08\x11\x22\x33\x44\x55\x66\x77\x88", cid="\x00\x00\x00\x00" ) cmd, r = device.recv_raw() # timeout assert cmd == 0xBF assert r[0] == CtapError.ERR.INVALID_CHANNEL - device.set_cid("\x05\x04\x03\x02") + device.set_cid(b"\x05\x04\x03\x02") def test_cid_ffffffff(self, device): - device.set_cid("\xff\xff\xff\xff") + device.set_cid(b"\xff\xff\xff\xff") device.send_raw( "\x81\x00\x08\x11\x22\x33\x44\x55\x66\x77\x88", cid="\xff\xff\xff\xff" ) cmd, r = device.recv_raw() # timeout assert cmd == 0xBF assert r[0] == CtapError.ERR.INVALID_CHANNEL - device.set_cid("\x05\x04\x03\x02") + device.set_cid(b"\x05\x04\x03\x02") def test_keep_alive(self, device, check_timeouts=False):