Rev 11464: All current tests in the testsuite mainly test the RPC
code in general. Since in file:///home/jelmer/bzr.samba/SAMBA_4_0/
Jelmer Vernooij
jelmer at samba.org
Wed Feb 14 19:26:07 GMT 2007
At file:///home/jelmer/bzr.samba/SAMBA_4_0/
------------------------------------------------------------
revno: 11464
revision-id: jelmer at samba.org-20070214192135-0yxxt5pto2lv4p4h
parent: svn-v2:21344 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Wed 2007-02-14 20:21:35 +0100
message:
All current tests in the testsuite mainly test the RPC code in general. Since
we're running the testsuite mainly against ourselves, we only check that the
push/pull functions work in our own environment, not whether they generate/parse
the same data that other systems do.
This commit adds the infrastructure for a testsuite for just the marshalling
code. The idea is that you provide a data blob, a function name and a function
to check the resulting struct for correctness.
added:
source/torture/ndr/ ndr-20070214151959-6fcxkg8engbdslq1-1
source/torture/ndr/ndr.c ndr.c-20070214151959-6fcxkg8engbdslq1-2
source/torture/ndr/ndr.h ndr.h-20070214174426-tvlh5u3t4p53qgy2-1
source/torture/ndr/winreg.c winreg.c-20070214152005-e9bbh48bza3e9x3h-1
modified:
source/librpc/idl/winreg.idl svn-v2:6 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flibrpc%2fidl%2fwinreg.idl
source/torture/config.mk svn-v2:860 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2fconfig.mk
=== added directory 'source/torture/ndr'
=== added file 'source/torture/ndr/ndr.c'
--- a/source/torture/ndr/ndr.c 1970-01-01 00:00:00 +0000
+++ b/source/torture/ndr/ndr.c 2007-02-14 19:21:35 +0000
@@ -0,0 +1,94 @@
+/*
+ Unix SMB/CIFS implementation.
+ test suite for winreg ndr operations
+
+ Copyright (C) Jelmer Vernooij 2007
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "torture/ndr/ndr.h"
+#include "torture/ndr/proto.h"
+#include "util/dlinklist.h"
+
+struct ndr_pull_test_data {
+ DATA_BLOB data;
+ size_t struct_size;
+ ndr_pull_flags_fn_t pull_fn;
+ int ndr_flags;
+};
+
+static bool wrap_ndr_pull_test(struct torture_context *tctx,
+ struct torture_tcase *tcase,
+ struct torture_test *test)
+{
+ bool (*check_fn) (struct torture_context *ctx, void *data) = test->fn;
+ const struct ndr_pull_test_data *data = test->data;
+ void *ds = talloc_zero_size(tctx, data->struct_size);
+ struct ndr_pull *ndr = ndr_pull_init_blob(&(data->data), tctx);
+
+ ndr->flags |= LIBNDR_FLAG_REF_ALLOC;
+
+ torture_assert_ntstatus_ok(tctx, data->pull_fn(ndr, data->ndr_flags, ds),
+ "pulling");
+
+ return check_fn(tctx, ds);
+}
+
+_PUBLIC_ struct torture_test *_torture_suite_add_ndr_pull_test(
+ struct torture_suite *suite,
+ const char *name, ndr_pull_flags_fn_t pull_fn,
+ DATA_BLOB db,
+ size_t struct_size,
+ int ndr_flags,
+ bool (*check_fn) (struct torture_context *ctx, void *data))
+{
+ struct torture_test *test;
+ struct torture_tcase *tcase;
+ struct ndr_pull_test_data *data;
+
+ tcase = torture_suite_add_tcase(suite, name);
+
+ test = talloc(tcase, struct torture_test);
+
+ test->name = talloc_strdup(test, name);
+ test->description = NULL;
+ test->run = wrap_ndr_pull_test;
+ data = talloc(test, struct ndr_pull_test_data);
+ data->data = db;
+ data->ndr_flags = ndr_flags;
+ data->struct_size = struct_size;
+ data->pull_fn = pull_fn;
+ test->data = data;
+ test->fn = check_fn;
+ test->dangerous = false;
+
+ DLIST_ADD_END(tcase->tests, test, struct torture_test *);
+
+ return test;
+}
+
+NTSTATUS torture_ndr_init(void)
+{
+ struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "NDR");
+
+ torture_suite_add_suite(suite, ndr_winreg_suite(suite));
+
+ torture_register_suite(suite);
+
+ return NT_STATUS_OK;
+}
+
=== added file 'source/torture/ndr/ndr.h'
--- a/source/torture/ndr/ndr.h 1970-01-01 00:00:00 +0000
+++ b/source/torture/ndr/ndr.h 2007-02-14 19:21:35 +0000
@@ -0,0 +1,45 @@
+/*
+ Unix SMB/CIFS implementation.
+ SMB torture tester
+ Copyright (C) Jelmer Vernooij 2007
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __TORTURE_NDR_H__
+#define __TORTURE_NDR_H__
+
+#include "torture/torture.h"
+#include "librpc/ndr/libndr.h"
+
+_PUBLIC_ struct torture_test *_torture_suite_add_ndr_pull_test(
+ struct torture_suite *suite,
+ const char *name, ndr_pull_flags_fn_t fn,
+ DATA_BLOB db,
+ size_t struct_size,
+ int ndr_flags,
+ bool (*check_fn) (struct torture_context *, void *data));
+
+#define torture_suite_add_ndr_pull_test(suite,name,data,check_fn) \
+ _torture_suite_add_ndr_pull_test(suite, #name, \
+ (ndr_pull_flags_fn_t)ndr_pull_ ## name, data_blob_talloc(suite, data, sizeof(data)), \
+ sizeof(struct name), 0, (bool (*) (struct torture_context *, void *)) check_fn);
+
+#define torture_suite_add_ndr_pull_fn_test(suite,name,data,flags,check_fn) \
+ _torture_suite_add_ndr_pull_test(suite, #name, \
+ (ndr_pull_flags_fn_t)ndr_pull_ ## name, data_blob_talloc(suite, data, sizeof(data)), \
+ sizeof(struct name), flags, (bool (*) (struct torture_context *, void *)) check_fn);
+
+#endif /* __TORTURE_NDR_H__ */
=== added file 'source/torture/ndr/winreg.c'
--- a/source/torture/ndr/winreg.c 1970-01-01 00:00:00 +0000
+++ b/source/torture/ndr/winreg.c 2007-02-14 19:21:35 +0000
@@ -0,0 +1,48 @@
+/*
+ Unix SMB/CIFS implementation.
+ test suite for winreg ndr operations
+
+ Copyright (C) Jelmer Vernooij 2007
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "torture/ndr/ndr.h"
+#include "librpc/gen_ndr/ndr_winreg.h"
+#include "librpc/gen_ndr/ndr_security.h"
+#include "libcli/security/security.h"
+
+static const uint8_t winreg_closekey_data[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x1d, 0xd8, 0xd7, 0xaa, 0x8d, 0x6c, 0x3f, 0x48,
+ 0xa7, 0x1e, 0x02, 0x6a, 0x47, 0xf6, 0x7b, 0xae
+};
+
+static bool winreg_closekey_check(struct torture_context *tctx,
+ struct winreg_CloseKey *ck)
+{
+ torture_assert(tctx, ck->in.handle != NULL, "handle invalid");
+ torture_assert_int_equal(tctx, ck->in.handle->handle_type, 0, "handle type");
+ return true;
+}
+
+struct torture_suite *ndr_winreg_suite(TALLOC_CTX *ctx)
+{
+ struct torture_suite *suite = torture_suite_create(ctx, "winreg");
+
+ torture_suite_add_ndr_pull_fn_test(suite, winreg_CloseKey, winreg_closekey_data, NDR_IN, winreg_closekey_check );
+
+ return suite;
+}
=== modified file 'source/librpc/idl/winreg.idl'
--- a/source/librpc/idl/winreg.idl 2007-02-14 15:23:12 +0000
+++ b/source/librpc/idl/winreg.idl 2007-02-14 19:21:35 +0000
@@ -89,7 +89,7 @@
/******************/
/* Function: 0x05 */
- WERROR winreg_CloseKey(
+ [public] WERROR winreg_CloseKey(
[in,out,ref] policy_handle *handle
);
=== modified file 'source/torture/config.mk'
--- a/source/torture/config.mk 2007-01-28 13:14:52 +0000
+++ b/source/torture/config.mk 2007-02-14 19:21:35 +0000
@@ -96,6 +96,13 @@
include smb2/config.mk
+[MODULE::torture_ndr]
+SUBSYSTEM = torture
+INIT_FUNCTION = torture_ndr_init
+PRIVATE_PROTO_HEADER = ndr/proto.h
+OBJ_FILES = ndr/ndr.o \
+ ndr/winreg.o
+
[MODULE::torture_rpc]
# TORTURE_NET and TORTURE_NBT use functions from torture_rpc...
#OUTPUT_TYPE = INTEGRATED
More information about the samba-cvs
mailing list