[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Fri Mar 12 18:28:19 MST 2010
The branch, master has been updated
via 8f07737... s4-smbtorture: warn on unexpected devicenames in spoolss devicemode test.
via 6833094... s4-smbtorture: send even more random data in extended winreg SetValue test.
from 33d9901... s4-smbtorture: fix build and handle in spoolss test.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8f0773771491dd12c0fa0b8967009364d1daa188
Author: Günther Deschner <gd at samba.org>
Date: Sat Mar 13 02:26:59 2010 +0100
s4-smbtorture: warn on unexpected devicenames in spoolss devicemode test.
Guenther
commit 6833094d6bddf53ee403f89e4f949b9e23041974
Author: Günther Deschner <gd at samba.org>
Date: Sat Mar 13 01:37:32 2010 +0100
s4-smbtorture: send even more random data in extended winreg SetValue test.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source4/torture/rpc/spoolss.c | 4 ++--
source4/torture/rpc/winreg.c | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 76e8a16..7d82529 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -2093,7 +2093,7 @@ static bool test_PrinterInfo_DevModes(struct torture_context *tctx,
devmode2 = info.info8.devmode;
if (strequal(devmode->devicename, devmode2->devicename)) {
- torture_comment(tctx, "devicenames are the same\n");
+ torture_warning(tctx, "devicenames are the same\n");
} else {
torture_comment(tctx, "devicename passed in for open: %s\n", devmode->devicename);
torture_comment(tctx, "devicename after level 8 get: %s\n", devmode2->devicename);
@@ -2118,7 +2118,7 @@ static bool test_PrinterInfo_DevModes(struct torture_context *tctx,
devmode2 = info.info2.devmode;
if (strequal(devmode->devicename, devmode2->devicename)) {
- torture_comment(tctx, "devicenames are the same\n");
+ torture_warning(tctx, "devicenames are the same\n");
} else {
torture_comment(tctx, "devicename passed in for open: %s\n", devmode->devicename);
torture_comment(tctx, "devicename after level 2 get: %s\n", devmode2->devicename);
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 0f3e383..538def6 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -2038,10 +2038,10 @@ static bool test_SetValue_extended(struct dcerpc_pipe *p,
14,
55,
123456,
- 653210
+ 653210,
+ __LINE__
};
- const char *str = "abcdefghijklmnopqrstuvwxzy";
- int t, s;
+ int t, l;
if (torture_setting_bool(tctx, "samba3", false) ||
torture_setting_bool(tctx, "samba4", false)) {
@@ -2051,13 +2051,13 @@ static bool test_SetValue_extended(struct dcerpc_pipe *p,
torture_comment(tctx, "Testing SetValue (extended formats)\n");
for (t=0; t < ARRAY_SIZE(types); t++) {
- for (s=0; s < strlen(str); s++) {
+ for (l=0; l < 32; l++) {
enum winreg_Type w_type;
uint32_t w_size, w_length;
uint8_t *w_data;
- const char *string = talloc_strndup(tctx, str, s);
+ const char *string = generate_random_str(tctx, l);
DATA_BLOB blob = data_blob_string_const(string);
torture_assert(tctx,
--
Samba Shared Repository
More information about the samba-cvs
mailing list