fixes after --eff changes

testing/test_ephemeral.py

@@ -336,7 +336,7 @@ def verify_ephemeral_secret_ui(cap_story, cap_menu, dev, fake_txn, goto_home,
 
             assert "Seed In Use" in m
             pick_menu_item("Seed In Use")  # noop
-        else:
+        elif seed_vault is False:
             # Seed Vault disabled
             m = cap_menu()
             assert "Seed Vault" not in m

testing/test_hobble.py

@@ -361,7 +361,8 @@ def test_h_tempseeds(mode, set_hobble, pick_menu_item, cap_menu, settings_set, i
         # different UX for passphrase - verified above
         confirm_tmp_seed(seedvault=False, check_sv_not_offered=True)
 
-    verify_ephemeral_secret_ui(expected_xfp=expect_xfp, mnemonic=None, seed_vault=False)
+    # do not verify presence of Seed Vault menu item - irrelevant
+    verify_ephemeral_secret_ui(expected_xfp=expect_xfp, mnemonic=None, seed_vault=None)
 
     pick_menu_item("Restore Master")
     press_select()

testing/test_multisig.py

@@ -1487,6 +1487,8 @@ def test_ms_sign_myself(M, use_regtest, make_myself_wallet, segwit, num_ins, dev
         f.write(b64encode(psbt).decode())
     for idx in range(M):
         select_wallet(idx)
+        if incl_xpubs:
+            clear_ms()
         _, updated = try_sign(psbt, accept_ms_import=incl_xpubs)
         with open(f'{sim_root_dir}/debug/myself-after.psbt', 'w') as f:
             f.write(b64encode(updated).decode())

testing/test_teleport.py

@@ -741,16 +741,17 @@ def test_hobble_limited(set_hobble, scan_a_qr, cap_menu, cap_screen, pick_menu_i
 
     set_hobble(True)
 
-    from bbqr.split import split_qrs
-    from bbqr import split_qrs, join_qrs
+    from bbqr import split_qrs
 
     _, parts = split_qrs(b's'*33, 'R')
     rx_complete(parts[0], '12345678', expect_fail=True)
+    time.sleep(.1)
     last = cap_screen().split('\n')[-1]
     assert last == 'KT Blocked'
 
     _, parts = split_qrs(b's'*33, 'S')
     rx_complete(parts[0], 'abcdefgh', expect_fail=True)
+    time.sleep(.1)
     last = cap_screen().split('\n')[-1]
     assert last == 'KT Blocked'
     

unix/sim_boot.py

@@ -34,6 +34,7 @@ if '--sflash' not in sys.argv:
 
         def _monkey_load(self, *a):
             self.current = dict(NVSTORE_FAKE.get(self.nvram_key, {}))
+            self.current = self.current or sim_defaults
         def _monkey_save(self, *a):
             NVSTORE_FAKE[self.nvram_key] = dict(self.current)