Detlef Riekenberg : winspool: Filter additional failures.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Dec 19 14:22:17 CST 2005
Module: wine
Branch: refs/heads/master
Commit: 6035b93e455d4577ba1cb29602df5267048246ec
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6035b93e455d4577ba1cb29602df5267048246ec
Author: Detlef Riekenberg <wine.dev at web.de>
Date: Mon Dec 19 21:19:47 2005 +0100
winspool: Filter additional failures.
---
dlls/winspool/tests/info.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/dlls/winspool/tests/info.c b/dlls/winspool/tests/info.c
index 0401546..2218ef4 100644
--- a/dlls/winspool/tests/info.c
+++ b/dlls/winspool/tests/info.c
@@ -418,8 +418,10 @@ static void test_openprinter(void)
hprinter = (HANDLE) MAGIC_DEAD;
SetLastError(MAGIC_DEAD);
res = OpenPrinter(default_printer, &hprinter, &defaults);
- ok(res || (!res && GetLastError() == ERROR_INVALID_DATATYPE),
- "returned %ld with %ld (expected '!=0' or '0' with ERROR_INVALID_DATATYPE)\n",
+ ok(res || (GetLastError() == ERROR_INVALID_DATATYPE ||
+ GetLastError() == RPC_S_SERVER_UNAVAILABLE),
+ "returned %ld with %ld (expected '!=0' or '0' with: " \
+ "ERROR_INVALID_DATATYPE or RPC_S_SERVER_UNAVAILABLE)\n",
res, GetLastError());
if(res) ClosePrinter(hprinter);
@@ -430,8 +432,10 @@ static void test_openprinter(void)
hprinter = (HANDLE) MAGIC_DEAD;
SetLastError(MAGIC_DEAD);
res = OpenPrinter(default_printer, &hprinter, &defaults);
- ok(res || (!res && GetLastError() == ERROR_ACCESS_DENIED),
- "returned %ld with %ld (expected '!=0' or '0' with ERROR_ACCESS_DENIED)\n",
+ ok(res || (GetLastError() == ERROR_ACCESS_DENIED ||
+ GetLastError() == RPC_S_SERVER_UNAVAILABLE),
+ "returned %ld with %ld (expected '!=0' or '0' with: " \
+ "ERROR_ACCESS_DENIED or RPC_S_SERVER_UNAVAILABLE)\n",
res, GetLastError());
if(res) ClosePrinter(hprinter);
@@ -440,8 +444,10 @@ static void test_openprinter(void)
hprinter = (HANDLE) MAGIC_DEAD;
SetLastError(MAGIC_DEAD);
res = OpenPrinter(default_printer, &hprinter, &defaults);
- ok(res || (!res && GetLastError() == ERROR_ACCESS_DENIED),
- "returned %ld with %ld (expected '!=0' or '0' with ERROR_ACCESS_DENIED)\n",
+ ok(res || (GetLastError() == ERROR_ACCESS_DENIED ||
+ GetLastError() == RPC_S_SERVER_UNAVAILABLE),
+ "returned %ld with %ld (expected '!=0' or '0' with: " \
+ "ERROR_ACCESS_DENIED or RPC_S_SERVER_UNAVAILABLE)\n",
res, GetLastError());
if(res) ClosePrinter(hprinter);
}
More information about the wine-cvs
mailing list