diff options
| author | Günther Deschner <gd@samba.org> | 2010-11-10 15:21:15 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-11-10 15:07:12 +0000 |
| commit | ec50db61fa6f3cf026c1f0f40528587b3dec8da3 (patch) | |
| tree | 85029b7f818e3ecfc6d39a93cf5490043e07a7a9 /source4 | |
| parent | 1c579318ae2d2480ee4cc998443c0d1661b39846 (diff) | |
| download | samba-ec50db61fa6f3cf026c1f0f40528587b3dec8da3.tar.gz samba-ec50db61fa6f3cf026c1f0f40528587b3dec8da3.tar.bz2 samba-ec50db61fa6f3cf026c1f0f40528587b3dec8da3.zip | |
s4-smbtorture: use test_GetPrinterData{Ex}_checktype calls in RPC-SPOOLSS tests.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Wed Nov 10 15:07:12 UTC 2010 on sn-devel-104
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/torture/rpc/spoolss.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 8b219777f3..6530a85495 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -4784,7 +4784,7 @@ static bool test_SetPrinterData_matrix(struct torture_context *tctx, for (i=0; i < ARRAY_SIZE(values); i++) { - enum winreg_Type type; + enum winreg_Type type, expected_type = REG_SZ; DATA_BLOB blob; uint8_t *data; uint32_t needed; @@ -4797,7 +4797,7 @@ static bool test_SetPrinterData_matrix(struct torture_context *tctx, "SetPrinterData failed"); torture_assert(tctx, - test_GetPrinterData(tctx, b, handle, values[i], &type, &data, &needed), + test_GetPrinterData_checktype(tctx, b, handle, values[i], &expected_type, &type, &data, &needed), "GetPrinterData failed"); torture_assert_int_equal(tctx, type, REG_SZ, "type mismatch"); @@ -5120,7 +5120,7 @@ static bool test_SetPrinterDataEx_matrix(struct torture_context *tctx, "failed to call SetPrinterDataEx"); torture_assert(tctx, - test_GetPrinterDataEx(tctx, p, handle, key_name, value_name, &type, &data_out, &needed), + test_GetPrinterDataEx_checktype(tctx, p, handle, key_name, value_name, &types[t], &type, &data_out, &needed), "failed to call GetPrinterDataEx"); torture_assert(tctx, |