selftest: run AppleDouble sidecar-file conversion test runs against all fruit shares

This needs for work in all possible fruit configs, so test it.

This currently fails with stream_depot, as we don't propely copy over
the resourcefork data from the ._ file to the stream.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13155

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(backported from commit e28dd6a0ce753a880b2512eb62661411b20f763b)

diff --git a/selftest/knownfail b/selftest/knownfail
index 713e39b8e27428256647b5e4aa64820795ae76b8..6e1d0589922d4c1d9e1fe51949f0513dc8dc41d7 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -307,3 +307,4 @@
 ^samba.tests.dcerpc.dnsserver.samba.tests.dcerpc.dnsserver.DnsserverTests.test_add_duplicate_different_type.*
 ^samba.tests.dcerpc.dnsserver.samba.tests.dcerpc.dnsserver.DnsserverTests.test_rank_none.*
 ^samba.tests.dcerpc.dnsserver.samba.tests.dcerpc.dnsserver.DnsserverTests.test_security_descriptor.*
+^samba3.vfs.fruit streams_depot.OS X AppleDouble file conversion\(nt4_dc\)

diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c
index 16b64772296089cd57b5050d026b4ba6bfed08ef..beac24f56cd6fa1afd168c7c1384e633d8fb7afc 100644 (file)
--- a/source4/torture/vfs/fruit.c
+++ b/source4/torture/vfs/fruit.c
@@ -4182,6 +4182,7 @@ struct torture_suite *torture_vfs_fruit(void)
        torture_suite_add_1smb2_test(suite, "readdir_attr with names with illegal ntfs characters", test_readdir_attr_illegal_ntfs);
        torture_suite_add_2ns_smb2_test(suite, "invalid AFP_AfpInfo", test_invalid_afpinfo);
        torture_suite_add_1smb2_test(suite, "creating rsrc with read-only access", test_rfork_create_ro);
+       torture_suite_add_1smb2_test(suite, "OS X AppleDouble file conversion", test_adouble_conversion);
 
        return suite;
 }
@@ -4260,7 +4261,6 @@ struct torture_suite *torture_vfs_fruit_netatalk(void)
        suite->description = talloc_strdup(suite, "vfs_fruit tests for Netatalk interop that require fruit:metadata=netatalk");
 
        torture_suite_add_1smb2_test(suite, "read netatalk metadata", test_read_netatalk_metadata);
-       torture_suite_add_1smb2_test(suite, "OS X AppleDouble file conversion", test_adouble_conversion);
        torture_suite_add_1smb2_test(suite, "stream names with locally created xattr", test_stream_names_local);
 
        return suite;