From bb8bbedcb7412520471c377bea2bd19e93c596b8 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Fri, 16 Mar 2018 21:55:26 +0100 Subject: [PATCH] selftest: run vfs.fruit_netatalk test against seperate share These tests require a fs with xattr support. This allows adding xattr_tdb to all other shares in the next commit. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13319 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison (cherry picked from commit 013aaffe7ff0ed4c30495761bb3208c29b3b5de2) --- selftest/target/Samba3.pm | 10 ++++++++++ source3/selftest/tests.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 4178ed2fdfd..571d25369f9 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -1811,6 +1811,16 @@ sub provision($$$$$$$$$) fruit:encoding = native fruit:veto_appledouble = no +[vfs_fruit_xattr] + path = $shrdir + # This is used by vfs.fruit tests that require real fs xattr + vfs objects = catia fruit streams_xattr acl_xattr + fruit:resource = file + fruit:metadata = netatalk + fruit:locking = netatalk + fruit:encoding = native + fruit:veto_appledouble = no + [vfs_fruit_metadata_stream] path = $shrdir vfs objects = fruit streams_xattr acl_xattr diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index e40150b42c1..152099010c8 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -486,7 +486,7 @@ for t in tests: plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/vfs_fruit_metadata_stream -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc/share --option=torture:share2=vfs_wo_fruit', 'metadata_stream') plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/vfs_fruit_stream_depot -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc/share --option=torture:share2=vfs_wo_fruit_stream_depot', 'streams_depot') elif t == "vfs.fruit_netatalk": - plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/vfs_fruit -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc/share') + plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/vfs_fruit_xattr -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc/share') elif t == "vfs.fruit_file_id": plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/vfs_fruit -U$USERNAME%$PASSWORD') elif t == "rpc.schannel_anon_setpw": -- 2.11.4.GIT