test: make presign display evidence fail closed

Author: BitHighlander

scripts/generate-test-report.py

@@ -52,6 +52,7 @@
 
 from __future__ import print_function
 
+import os
 import unittest
 
 import common
@@ -69,17 +70,28 @@ class ScreenRecorder(object):
     displayed; reading it afterwards would only ever see the home screen.
     """
 
-    def __init__(self, client, answer=True):
+    def __init__(self, client, answer=True, screenshot_group=None):
         self.client = client
         self.answer = answer
+        self.screenshot_group = screenshot_group
         self.screens = []
         self._original = None
+        self._original_screenshot_dir = None
+        self._original_screenshot_id = None
 
     def __enter__(self):
         client = self.client
         recorder = self
 
         self._original = client.callback_ButtonRequest
+        if self.screenshot_group and getattr(client, 'screenshot_dir', None):
+            self._original_screenshot_dir = client.screenshot_dir
+            self._original_screenshot_id = client.screenshot_id
+            client.screenshot_dir = os.path.join(
+                client.screenshot_dir, self.screenshot_group
+            )
+            os.makedirs(client.screenshot_dir, exist_ok=True)
+            client.screenshot_id = 0
 
         def recording_callback(msg):
             try:
@@ -112,6 +124,9 @@ def recording_callback(msg):
 
     def __exit__(self, exc_type, exc_value, tb):
         self.client.callback_ButtonRequest = self._original
+        if self._original_screenshot_dir is not None:
+            self.client.screenshot_dir = self._original_screenshot_dir
+            self.client.screenshot_id = self._original_screenshot_id
         return False
 
     @property
@@ -131,6 +146,12 @@ class TestDisplayDisclosesSignedContent(common.KeepKeyTest):
     def setUp(self):
         super(TestDisplayDisclosesSignedContent, self).setUp()
         self.requires_firmware(self.MIN_FIRMWARE)
+        # These are positive display-binding controls, not refusal tests. A
+        # fresh emulator is uninitialized; without an explicit seed setup every
+        # request is rejected before its first ButtonRequest, the differential
+        # cases vacuously "pass", and the only non-vacuity control skips. Keep
+        # the fixture capable of reaching the confirmation path.
+        self.setup_mnemonic_allallall()
 
     # ── helpers ─────────────────────────────────────────────────────────
 
@@ -244,8 +265,11 @@ def test_signing_shows_at_least_one_screen(self):
         empty tuples and the suite would pass while showing the user nothing.
         """
         screens = self._sign_message_screens(b"hello")
-        if screens is None:
-            self.skipTest("device refused to sign the control message")
+        self.assertIsNotNone(
+            screens,
+            "device refused the control request; the display-binding A/B "
+            "tests did not prove they can reach a confirmation path",
+        )
         self.assertGreater(
             len(screens), 0,
             "signing produced no ButtonRequest, so nothing was shown to the "

tests/test_msg_display_disclosure.py

@@ -60,8 +60,12 @@ def setUp(self):
         self.requires_firmware("7.14.2")
         self.setup_mnemonic_allallall()
 
-    def _capture(self, request):
-        recorder = ScreenRecorder(self.client, answer=True)
+    def _capture(self, request, screenshot_group):
+        recorder = ScreenRecorder(
+            self.client,
+            answer=True,
+            screenshot_group=screenshot_group,
+        )
         try:
             with recorder:
                 self.client.call(request)
@@ -74,8 +78,8 @@ def _assert_tail_mutation_changes_review(self, make_request):
         payload_b = payload_a[:96] + b"B" + payload_a[97:]
         self.assertEqual(payload_a[:32], payload_b[:32])
 
-        screens_a = self._capture(make_request(payload_a))
-        screens_b = self._capture(make_request(payload_b))
+        screens_a = self._capture(make_request(payload_a), "payload-a")
+        screens_b = self._capture(make_request(payload_b), "payload-b")
         self.assertIsNotNone(screens_a)
         self.assertIsNotNone(screens_b)
         self.assertGreater(len(screens_a), 1)
@@ -113,15 +117,17 @@ def test_offchain_format_changes_oled_review(self):
                 version=0,
                 message_format=0,
                 message=payload,
-            )
+            ),
+            "format-ascii",
         )
         screens_utf8 = self._capture(
             solana.SolanaSignOffchainMessage(
                 address_n=PATH,
                 version=0,
                 message_format=1,
                 message=payload,
-            )
+            ),
+            "format-utf8",
         )
         self.assertIsNotNone(screens_ascii)
         self.assertIsNotNone(screens_utf8)
@@ -142,4 +148,3 @@ def test_memo_tail_changes_oled_review(self):
                 raw_tx=build_memo_tx(signer, payload),
             )
         )
-