Module: wine Branch: master Commit: 0b7711e545e2aa8d43049114b8a823112212486c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b7711e545e2aa8d43049114b8...
Author: Juan Lang juan.lang@gmail.com Date: Mon May 17 10:44:11 2010 -0700
wintrust/tests: Fix test failures when not running as administrator.
---
dlls/wintrust/tests/crypt.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 64a91b7..68a9ebc 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -233,7 +233,12 @@ static void test_context(void) */
ret = pCryptCATAdminAcquireContext(&hca, &dummy, 0); - ok(ret, "Expected success\n"); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "CryptCATAdminAcquireContext failed %u\n", GetLastError()); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("Not running as administrator\n"); + return; + } ok(hca != NULL, "Expected a context handle, got NULL\n");
attrs = GetFileAttributes(catroot); @@ -492,7 +497,12 @@ static void test_CryptCATAdminAddRemoveCatalog(void) CloseHandle(file);
ret = pCryptCATAdminAcquireContext(&hcatadmin, &dummy, 0); - ok(ret, "CryptCATAdminAcquireContext failed %u\n", GetLastError()); + ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "CryptCATAdminAcquireContext failed %u\n", GetLastError()); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + win_skip("Not running as administrator\n"); + return; + }
SetLastError(0xdeadbeef); hcatinfo = pCryptCATAdminAddCatalog(NULL, NULL, NULL, 0);