From 2b5113283fa37d4cdf643a597a43297a464d341d Mon Sep 17 00:00:00 2001 From: Shwetha K Acharya Date: Tue, 6 Aug 2024 21:27:56 +0530 Subject: [PATCH] smbtorture: Add Shadow Copy related tests - Some of the sparse file related tests are expected to fail due to limitations in CephFS, mark the same - Make sure that ioctl tests are expected to strictly pass against CephFS and CephFS.vfs only. Signed-off-by: Shwetha K Acharya --- testcases/smbtorture/selftest/flapping.glusterfs | 3 +++ testcases/smbtorture/selftest/flapping.gpfs | 3 +++ testcases/smbtorture/selftest/flapping.xfs | 3 +++ testcases/smbtorture/selftest/knownfail.d/sparse_files | 10 ++++++++++ testcases/smbtorture/smbtorture-tests-info.yml | 1 + 5 files changed, 20 insertions(+) create mode 100644 testcases/smbtorture/selftest/knownfail.d/sparse_files diff --git a/testcases/smbtorture/selftest/flapping.glusterfs b/testcases/smbtorture/selftest/flapping.glusterfs index 21f86d1..3e165b1 100644 --- a/testcases/smbtorture/selftest/flapping.glusterfs +++ b/testcases/smbtorture/selftest/flapping.glusterfs @@ -10,3 +10,6 @@ #https://github.com/gluster/samba-integration/issues/241 ^samba3.smb2.deny.* + +# Strictly checking ioctl tests against cephFS only +^samba3.smb2.ioctl.* diff --git a/testcases/smbtorture/selftest/flapping.gpfs b/testcases/smbtorture/selftest/flapping.gpfs index add0b1c..44bcc5f 100644 --- a/testcases/smbtorture/selftest/flapping.gpfs +++ b/testcases/smbtorture/selftest/flapping.gpfs @@ -5,3 +5,6 @@ # Ignore due to lack of proper multichannel setup. ^samba3.smb2.session.bind2 ^samba3.smb2.session.two_logoff + +# Strictly checking ioctl tests against cephFS only +^samba3.smb2.ioctl.* diff --git a/testcases/smbtorture/selftest/flapping.xfs b/testcases/smbtorture/selftest/flapping.xfs index fdd9121..7d90e21 100644 --- a/testcases/smbtorture/selftest/flapping.xfs +++ b/testcases/smbtorture/selftest/flapping.xfs @@ -8,3 +8,6 @@ # https://github.com/samba-in-kubernetes/sit-environment/pull/109 samba3.smb2.session.reauth4 + +# Strictly checking ioctl tests against cephFS only +^samba3.smb2.ioctl.* diff --git a/testcases/smbtorture/selftest/knownfail.d/sparse_files b/testcases/smbtorture/selftest/knownfail.d/sparse_files new file mode 100644 index 0000000..55205e6 --- /dev/null +++ b/testcases/smbtorture/selftest/knownfail.d/sparse_files @@ -0,0 +1,10 @@ ++# CephFS does not explicitly track which parts of a file are allocated/written with sparse files, ++# the st_blocks field is always populated by the file size divided by the block size. ++# This will cause tools like du(1) to overestimate consumed space. ++# (The recursive size field, maintained by CephFS, also includes file “holes” in its count.) ++ ++# Refer: https://github.com/samba-in-kubernetes/sit-test-cases/issues/86 ++^samba3.smb2.ioctl.sparse_punch ++^samba3.smb2.ioctl.sparse_qar_ob1 ++^samba3.smb2.ioctl.sparse_punch_invalid ++^samba3.smb2.ioctl.copy-chunk streams diff --git a/testcases/smbtorture/smbtorture-tests-info.yml b/testcases/smbtorture/smbtorture-tests-info.yml index 696e924..cbe1038 100644 --- a/testcases/smbtorture/smbtorture-tests-info.yml +++ b/testcases/smbtorture/smbtorture-tests-info.yml @@ -31,3 +31,4 @@ - smb2.bench - smb2.winattr2 - smb2.charset +- smb2.ioctl