handle nfc/vdsk enabled or not in unrelated tests

testing/conftest.py

@@ -608,6 +608,9 @@ def virtdisk_path(request, is_simulator, only_mk4):
     def doit(fn):
         # could use: ckcc.get_sim_root_dirs() here
         if is_simulator():
+            get_setting = request.getfixturevalue('get_setting')
+            if not get_setting('vidsk', False):
+                raise pytest.xfail('virtdisk disabled')
             assert os.path.isdir('../unix/work/VirtDisk')
             return '../unix/work/VirtDisk/' + fn
         elif sys.platform == 'darwin':

testing/test_multisig.py

@@ -882,7 +882,7 @@ def test_import_dup_safe(N, clear_ms, make_multisig, offer_ms_import, need_keypr
 
         menu = cap_menu()
         assert f'{M}/{N}: {name}' in menu
-        assert len(menu) == 6 + num_wallets
+        assert (len(menu) - num_wallets) in [5, 6]        # depending if NFC enabled or not
 
     title, story = offer_ms_import(make_named('xxx-orig'))
     assert 'Create new multisig wallet' in story