s3: smbd: Fix dumb typos that meant smb1.SMB1-DFS-* tests were running against an...

Remove knownfail on SMB1-DFS-SEARCH-PATHS, as we now
pass it with the new SMB1 remove DFS paths before pathname processing
changes.

Note, we still fail:

smb1.SMB1-DFS-PATHS.smbtorture\(fileserver_smb1\)
smb1.SMB1-DFS-OPERATIONS.smbtorture\(fileserver_smb1\)

even with the new SMB1 remove DFS paths before pathname
processing as those tests test *very* specific Windows behaviors. We now
pass many more of the individual internal tests, but
in order to pass them all completely I need to add
specific --with-sambaserver checks to avoid some
of the Windows DFS SMB1 insanity (error messages).

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Fri Mar 31 06:07:01 UTC 2023 on atb-devel-224

diff --git a/selftest/knownfail.d/dfs_paths b/selftest/knownfail.d/dfs_paths
index eb29a85ad96bfa8e16f40ba9255eeddef23295ed..fb7b832d1570a23f413f74668df88a595fd5b351 100644 (file)
--- a/selftest/knownfail.d/dfs_paths
+++ b/selftest/knownfail.d/dfs_paths
@@ -1,3 +1,2 @@
-^samba3.smbtorture_s3.smb1.SMB1-DFS-PATHS.smbtorture\(fileserver\)
-^samba3.smbtorture_s3.smb1.SMB1-DFS-SEARCH-PATHS.smbtorture\(fileserver\)
-^samba3.smbtorture_s3.smb1.SMB1-DFS-OPERATIONS.smbtorture\(fileserver\)
+^samba3.smbtorture_s3.smb1.SMB1-DFS-PATHS.smbtorture\(fileserver_smb1\)
+^samba3.smbtorture_s3.smb1.SMB1-DFS-OPERATIONS.smbtorture\(fileserver_smb1\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 98b4eb361c30340aebb8375cfb632e4de11c9bca..31112d4be9faac6b7e582037967b11fac1dd988e 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -313,7 +313,7 @@ plantestsuite("samba3.smbtorture_s3.smb2.SMB2-DFS-SHARE-NON-DFS-PATH",
 # incoming DFS pathnames and how they map to local paths.
 #
 plantestsuite("samba3.smbtorture_s3.smb1.SMB1-DFS-PATHS",
-                "fileserver",
+                "fileserver_smb1",
                 [os.path.join(samba3srcdir,
                               "script/tests/test_smbtorture_s3.sh"),
                 'SMB1-DFS-PATHS',
@@ -329,7 +329,7 @@ plantestsuite("samba3.smbtorture_s3.smb1.SMB1-DFS-PATHS",
 # incoming DFS pathnames and how they map to local paths.
 #
 plantestsuite("samba3.smbtorture_s3.smb1.SMB1-DFS-SEARCH-PATHS",
-                "fileserver",
+                "fileserver_smb1",
                 [os.path.join(samba3srcdir,
                               "script/tests/test_smbtorture_s3.sh"),
                 'SMB1-DFS-SEARCH-PATHS',
@@ -345,7 +345,7 @@ plantestsuite("samba3.smbtorture_s3.smb1.SMB1-DFS-SEARCH-PATHS",
 # incoming DFS pathnames and how they map to local paths.
 #
 plantestsuite("samba3.smbtorture_s3.smb1.SMB1-DFS-OPERATIONS",
-                "fileserver",
+                "fileserver_smb1",
                 [os.path.join(samba3srcdir,
                               "script/tests/test_smbtorture_s3.sh"),
                 'SMB1-DFS-OPERATIONS',