From cf48d197599e51f7c67353174dc565f3a0ec4e54 Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Fri, 10 Feb 2017 22:19:25 -0800 Subject: [PATCH] tst: winfsp-tests: delete_standby_test: disable portion that fails under a share --- tst/winfsp-tests/info-test.c | 87 +++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 42 deletions(-) diff --git a/tst/winfsp-tests/info-test.c b/tst/winfsp-tests/info-test.c index 96e3dd4a..f713212e 100644 --- a/tst/winfsp-tests/info-test.c +++ b/tst/winfsp-tests/info-test.c @@ -683,53 +683,56 @@ static void delete_standby_dotest(ULONG Flags, PWSTR Prefix, ULONG FileInfoTimeo ASSERT(!Success); ASSERT(ERROR_FILE_NOT_FOUND == GetLastError()); - Success = CreateDirectoryW(Dir1Path, 0); - ASSERT(Success); + if (!OptShareName) + { + Success = CreateDirectoryW(Dir1Path, 0); + ASSERT(Success); - srand(seed); + srand(seed); - Handle = CreateFileW(File0Path, - GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, - CREATE_NEW, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, 0); - ASSERT(INVALID_HANDLE_VALUE != Handle); - Mapping0 = CreateFileMappingW(Handle, 0, PAGE_READWRITE, - 0, 16 * SystemInfo.dwAllocationGranularity, 0); - ASSERT(0 != Mapping0); - Success = CloseHandle(Handle); - ASSERT(Success); - MappedView0 = MapViewOfFile(Mapping0, FILE_MAP_ALL_ACCESS, 0, 0, 0); - ASSERT(0 != MappedView0); - for (PUINT8 P = MappedView0, EndP = P + 16 * SystemInfo.dwAllocationGranularity; EndP > P; P++) - *P = rand() & 0xff; - Success = UnmapViewOfFile(MappedView0); - ASSERT(Success); - Success = CloseHandle(Mapping0); - ASSERT(Success); + Handle = CreateFileW(File0Path, + GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, + CREATE_NEW, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, 0); + ASSERT(INVALID_HANDLE_VALUE != Handle); + Mapping0 = CreateFileMappingW(Handle, 0, PAGE_READWRITE, + 0, 16 * SystemInfo.dwAllocationGranularity, 0); + ASSERT(0 != Mapping0); + Success = CloseHandle(Handle); + ASSERT(Success); + MappedView0 = MapViewOfFile(Mapping0, FILE_MAP_ALL_ACCESS, 0, 0, 0); + ASSERT(0 != MappedView0); + for (PUINT8 P = MappedView0, EndP = P + 16 * SystemInfo.dwAllocationGranularity; EndP > P; P++) + *P = rand() & 0xff; + Success = UnmapViewOfFile(MappedView0); + ASSERT(Success); + Success = CloseHandle(Mapping0); + ASSERT(Success); - Handle = CreateFileW(File1Path, - GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, - CREATE_NEW, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, 0); - ASSERT(INVALID_HANDLE_VALUE != Handle); - Mapping1 = CreateFileMappingW(Handle, 0, PAGE_READWRITE, - 0, 16 * SystemInfo.dwAllocationGranularity, 0); - ASSERT(0 != Mapping1); - Success = CloseHandle(Handle); - ASSERT(Success); - MappedView1 = MapViewOfFile(Mapping1, FILE_MAP_ALL_ACCESS, 0, 0, 0); - ASSERT(0 != MappedView1); - for (PUINT8 P = MappedView1, EndP = P + 16 * SystemInfo.dwAllocationGranularity; EndP > P; P++) - *P = rand() & 0xff; - Success = UnmapViewOfFile(MappedView1); - ASSERT(Success); - Success = CloseHandle(Mapping1); - ASSERT(Success); + Handle = CreateFileW(File1Path, + GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, + CREATE_NEW, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, 0); + ASSERT(INVALID_HANDLE_VALUE != Handle); + Mapping1 = CreateFileMappingW(Handle, 0, PAGE_READWRITE, + 0, 16 * SystemInfo.dwAllocationGranularity, 0); + ASSERT(0 != Mapping1); + Success = CloseHandle(Handle); + ASSERT(Success); + MappedView1 = MapViewOfFile(Mapping1, FILE_MAP_ALL_ACCESS, 0, 0, 0); + ASSERT(0 != MappedView1); + for (PUINT8 P = MappedView1, EndP = P + 16 * SystemInfo.dwAllocationGranularity; EndP > P; P++) + *P = rand() & 0xff; + Success = UnmapViewOfFile(MappedView1); + ASSERT(Success); + Success = CloseHandle(Mapping1); + ASSERT(Success); - Success = RemoveDirectoryW(Dir1Path); - ASSERT(Success); + Success = RemoveDirectoryW(Dir1Path); + ASSERT(Success); - Success = RemoveDirectoryW(Dir1Path); - ASSERT(!Success); - ASSERT(ERROR_FILE_NOT_FOUND == GetLastError()); + Success = RemoveDirectoryW(Dir1Path); + ASSERT(!Success); + ASSERT(ERROR_FILE_NOT_FOUND == GetLastError()); + } memfs_stop(memfs); }