From 5e2518f0b0a476fc8fbbd39c5f47bee7131e918e Mon Sep 17 00:00:00 2001 From: caleb Date: Thu, 25 Jul 2024 07:37:05 -0400 Subject: [PATCH] address review --- tests/api2/test_001_ssh.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/api2/test_001_ssh.py b/tests/api2/test_001_ssh.py index 78032a3a76980..3ac7fa04e272d 100644 --- a/tests/api2/test_001_ssh.py +++ b/tests/api2/test_001_ssh.py @@ -109,7 +109,6 @@ def test_007_check_local_accounts(ws_client, account): fail(f'Group has unexpected name: {account["name"]} -> {entry["group"]}') -@pytest.mark.skip(reason='known issue c.f. NAS-127825') def test_008_check_root_dataset_settings(ws_client): data = SSH_TEST('cat /conf/truenas_root_ds.json', user, password) if not data['result']: @@ -146,7 +145,10 @@ def test_008_check_root_dataset_settings(ws_client): # This is a run where root filesystem is unlocked. Don't obther checking remaining continue - for opt in fhs_entry['options']: + # FIXME: c.f. NAS-127825 + # NOSUID is broken at boot, OS team is aware but fix is complicated. + # Skip this specific property for now. + for opt in filter(lambda x: x != 'NOSUID', fhs_entry['options']): if opt not in fs['mount_opts']: assert opt in fs['mount_opts'], f'{opt}: mount option not present for {mp}: {fs["mount_opts"]}'