From e01b8131c7b81788d6b25f1673c09569a18d120c Mon Sep 17 00:00:00 2001 From: Andrew Walker Date: Fri, 11 Oct 2024 13:36:19 -0600 Subject: [PATCH] Update tests for new meaning of xattr=on (#14661) In OpenZFS 2.3 the meaning of xattr=on changed from dir to sa which means that "ON" is now the expected value for the top-level dataset of a new zpool and for docker datasets. --- src/middlewared/middlewared/test/integration/utils/docker.py | 2 +- tests/api2/test_006_pool_and_sysds.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/middlewared/middlewared/test/integration/utils/docker.py b/src/middlewared/middlewared/test/integration/utils/docker.py index d41f61f2d52d6..3a211e4ac47c8 100644 --- a/src/middlewared/middlewared/test/integration/utils/docker.py +++ b/src/middlewared/middlewared/test/integration/utils/docker.py @@ -18,7 +18,7 @@ 'overlay': 'on', 'setuid': 'on', 'snapdir': 'hidden', - 'xattr': 'sa', + 'xattr': 'on', } diff --git a/tests/api2/test_006_pool_and_sysds.py b/tests/api2/test_006_pool_and_sysds.py index 703a5eca10af8..ace9bfbc496cb 100644 --- a/tests/api2/test_006_pool_and_sysds.py +++ b/tests/api2/test_006_pool_and_sysds.py @@ -239,7 +239,7 @@ def test__check_root_level_dataset_properties(): ds = call('pool.dataset.get_instance', pool_name) assert ds['acltype']['value'] == 'POSIX' assert ds['aclmode']['value'] == 'DISCARD' - assert ds['xattr']['value'] == 'SA' + assert ds['xattr']['value'] == 'ON' assert ds['deduplication']['value'] == 'OFF' assert ds['casesensitivity']['value'] == 'SENSITIVE' assert ds['compression']['value'] == 'LZ4'