diff --git a/tests/api2/test_001_ssh.py b/tests/api2/test_001_ssh.py index 736660949b453..3ac7fa04e272d 100644 --- a/tests/api2/test_001_ssh.py +++ b/tests/api2/test_001_ssh.py @@ -1,10 +1,7 @@ -from collections import defaultdict -import sys +import collections +import json import os -apifolder = os.getcwd() -sys.path.append(apifolder) -import json import pytest from functions import if_key_listed, SSH_TEST @@ -148,13 +145,16 @@ 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"]}' def test_009_check_listening_ports(): - listen = defaultdict(set) + listen = collections.defaultdict(set) for line in ssh("netstat -tuvpan | grep LISTEN").splitlines(): proto, _, _, local, _, _, process = line.split(maxsplit=6) if proto == "tcp":