[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  b772f4c testprogs: skip two tests in spoolss tester.
       via  6f5fa76 s4-smbtorture: fix winreg querymultiplevalues NDR test warning.
      from  66ad6c7 Ñ•3: remove smb_msleep prototype from here

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b772f4cdffda7f7e1bd0a7951bec0304102606d2
Author: Günther Deschner <gd at samba.org>
Date:   Fri Sep 17 10:06:16 2010 +0200

    testprogs: skip two tests in spoolss tester.
    
    Guenther

commit 6f5fa763c13f43cc805a9bd939c21970404deaec
Author: Günther Deschner <gd at samba.org>
Date:   Fri Sep 17 10:02:13 2010 +0200

    s4-smbtorture: fix winreg querymultiplevalues NDR test warning.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source4/torture/ndr/winreg.c          |    4 ++--
 testprogs/win32/spoolss/testspoolss.c |    4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/ndr/winreg.c b/source4/torture/ndr/winreg.c
index ca3a71e..b6da7bc 100644
--- a/source4/torture/ndr/winreg.c
+++ b/source4/torture/ndr/winreg.c
@@ -247,7 +247,7 @@ static bool querymultiplevalues_in_check(struct torture_context *tctx,
 	torture_assert_int_equal(tctx, r->in.values_in[0].ve_valuename->length, 18, "name len");
 	torture_assert_int_equal(tctx, r->in.values_in[0].ve_valuename->size, 18, "name size");
 	torture_assert_int_equal(tctx, r->in.values_in[0].ve_valuelen, 0, "length");
-	torture_assert(tctx, (r->in.values_in[0].ve_valueptr == NULL), "ve_valueptr");
+	torture_assert_int_equal(tctx, r->in.values_in[0].ve_valueptr, 0, "ve_valueptr");
 	torture_assert_int_equal(tctx, r->in.values_in[0].ve_type, 0, "type");
 	torture_assert_int_equal(tctx, *r->in.buffer_size, 32, "buffer size");
 
@@ -303,7 +303,7 @@ static bool querymultiplevalues2_in_check(struct torture_context *tctx,
 	torture_assert_int_equal(tctx, r->in.values_in[0].ve_valuename->length, 10, "name len");
 	torture_assert_int_equal(tctx, r->in.values_in[0].ve_valuename->size, 10, "name size");
 	torture_assert_int_equal(tctx, r->in.values_in[0].ve_valuelen, 0, "length");
-	torture_assert(tctx, (r->in.values_in[0].ve_valueptr == NULL), "ve_valueptr");
+	torture_assert_int_equal(tctx, r->in.values_in[0].ve_valueptr, 0,  "ve_valueptr");
 	torture_assert_int_equal(tctx, r->in.values_in[0].ve_type, 0, "type");
 	torture_assert_int_equal(tctx, *r->in.offered, 0, "buffer size");
 
diff --git a/testprogs/win32/spoolss/testspoolss.c b/testprogs/win32/spoolss/testspoolss.c
index 7aa3703..d0129ef 100644
--- a/testprogs/win32/spoolss/testspoolss.c
+++ b/testprogs/win32/spoolss/testspoolss.c
@@ -1052,8 +1052,12 @@ static BOOL test_OnePrinter(struct torture_context *tctx,
 	ret &= test_EnumPrinterData(tctx, printername, handle);
 	ret &= test_EnumPrinterDataEx(tctx, printername, "PrinterDriverData", handle, NULL, NULL);
 	ret &= test_DeviceModes(tctx, printername, handle);
+#if 0
+	/* dont run these at the moment, behaviour is PrinterData API calls (not
+	 * dcerpc calls) is almost unpredictable - gd */
 	ret &= test_PrinterData(tctx, printername, handle);
 	ret &= test_PrinterDataW(tctx, printername, handle);
+#endif
 	ret &= test_ClosePrinter(tctx, handle);
 
 	return ret;


-- 
Samba Shared Repository