From: Ralph Boehme <slow@samba.org>
Date: Tue, 26 Nov 2024 16:06:06 +0000 (+0100)
Subject: tests: fix test teardown/cleanup of test_create_reparse_directory()
X-Git-Tag: tdb-1.4.13~462
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44a2458ca4f02aece3ef7a3c98056bdcd78db4b9;p=thirdparty%2Fsamba.git

tests: fix test teardown/cleanup of test_create_reparse_directory()

This kept failing in a local make test not being able to cleanup the test
directory in the *subsequent* test test_create_reparse_nonempty_directory().

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
---

diff --git a/python/samba/tests/reparsepoints.py b/python/samba/tests/reparsepoints.py
index 42f301f4e24..130fdca911c 100644
--- a/python/samba/tests/reparsepoints.py
+++ b/python/samba/tests/reparsepoints.py
@@ -237,10 +237,14 @@ class ReparsePoints(samba.tests.libsmb.LibsmbTests):
             err = e.args[0]
             if (err != ntstatus.NT_STATUS_ACCESS_DENIED):
                 raise
+        finally:
+            conn.close(dir_fd)
+            self.clean_file(conn, dirname)
 
         if (err == ntstatus.NT_STATUS_ACCESS_DENIED):
             self.fail("Could not set reparse point on directory")
-            conn.delete_on_close(fd, 1)
+            conn.close(dir_fd)
+            self.clean_file(conn, dirname)
             return
 
         with self.assertRaises(NTSTATUSError) as e: