]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
selftest: run vfs.fruit_netatalk test against seperate share
authorRalph Boehme <slow@samba.org>
Fri, 16 Mar 2018 20:55:26 +0000 (21:55 +0100)
committerJeremy Allison <jra@samba.org>
Fri, 16 Mar 2018 22:07:09 +0000 (23:07 +0100)
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 <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
selftest/target/Samba3.pm
source3/selftest/tests.py

index e6c95fa991a5b01b849a240dcae37b4748b56e40..343ca074fb6c05e8731c761eb9a2ded3f76a36af 100755 (executable)
@@ -1896,6 +1896,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
index 402f44ff6ee0ee389673ed0774ef1551e8936cc8..c93abf5e632384f11eef048eedfc97055b15de3f 100755 (executable)
@@ -503,7 +503,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_timemachine":
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/vfs_fruit_timemachine -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc/share')
     elif t == "vfs.fruit_file_id":