From: Zhenbo Li Subject: kernel32/tests: Remove some expected values for test_DeleteFileA() Message-Id: <52A97CEC.4080401@gmail.com> Date: Thu, 12 Dec 2013 17:07:56 +0800 There're too many expected values from GetLastError(), and I think it might be confusing. Follow the testbot result[1], I wrote this patch. [1]: https://newtestbot.winehq.org/JobDetails.pl?Key=3716 --- dlls/kernel32/tests/file.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 1967631..f7ce499 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1616,20 +1616,15 @@ static void test_DeleteFileA( void ) HANDLE hfile; ret = DeleteFileA(NULL); - ok(!ret && (GetLastError() == ERROR_INVALID_PARAMETER || - GetLastError() == ERROR_PATH_NOT_FOUND), + ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND, "DeleteFileA(NULL) returned ret=%d error=%d\n",ret,GetLastError()); ret = DeleteFileA(""); - ok(!ret && (GetLastError() == ERROR_PATH_NOT_FOUND || - GetLastError() == ERROR_BAD_PATHNAME), + ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND, "DeleteFileA(\"\") returned ret=%d error=%d\n",ret,GetLastError()); ret = DeleteFileA("nul"); - ok(!ret && (GetLastError() == ERROR_FILE_NOT_FOUND || - GetLastError() == ERROR_INVALID_PARAMETER || - GetLastError() == ERROR_ACCESS_DENIED || - GetLastError() == ERROR_INVALID_FUNCTION), + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "DeleteFileA(\"nul\") returned ret=%d error=%d\n",ret,GetLastError()); GetTempPathA(MAX_PATH, temp_path);