From 1a2f5648fc73a0baa760e56d50a3817a9e339b91 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Wed, 15 Nov 2017 18:38:41 +0100 Subject: [PATCH] selftest: add localdir option to fruit subtests A subsequent commits modifies an existing tests that needs $localdir to also run against "vfs_fruit_metadata_stream" and "vfs_fruit_stream_depot". This reveals test failures, those will be fixed in a subsequent commit. Bug: https://bugzilla.samba.org/show_bug.cgi?id=13155 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison (cherry picked from commit 3c1bdafde6419c266941624f57cf768e57e2bd98) --- selftest/knownfail.d/samba3.vfs.fruit | 2 ++ source3/selftest/tests.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 selftest/knownfail.d/samba3.vfs.fruit diff --git a/selftest/knownfail.d/samba3.vfs.fruit b/selftest/knownfail.d/samba3.vfs.fruit new file mode 100644 index 00000000000..6df7b499781 --- /dev/null +++ b/selftest/knownfail.d/samba3.vfs.fruit @@ -0,0 +1,2 @@ +^samba3.vfs.fruit metadata_stream.stream names\(nt4_dc\) +^samba3.vfs.fruit streams_depot.stream names\(nt4_dc\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index bdaf6d4c33f..ead890247c3 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -475,8 +475,8 @@ for t in tests: plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD') elif t == "vfs.fruit": plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/vfs_fruit -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/nt4_dc/share --option=torture:share2=vfs_wo_fruit', 'metadata_netatalk') - plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/vfs_fruit_metadata_stream -U$USERNAME%$PASSWORD --option=torture:share2=vfs_wo_fruit', 'metadata_stream') - plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/vfs_fruit_stream_depot -U$USERNAME%$PASSWORD --option=torture:share2=vfs_wo_fruit_stream_depot', 'streams_depot') + 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') elif t == "vfs.fruit_file_id": -- 2.11.4.GIT