svn commit: samba r22328 - in branches/SAMBA_4_0: . source/param source/torture/local

jelmer at samba.org jelmer at samba.org
Wed Apr 18 01:17:33 GMT 2007


Author: jelmer
Date: 2007-04-18 01:17:30 +0000 (Wed, 18 Apr 2007)
New Revision: 22328

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22328

Log:
Add initial testsuite for share code.
Added:
   branches/SAMBA_4_0/source/torture/local/share.c
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/param/share.c
   branches/SAMBA_4_0/source/torture/local/config.mk
   branches/SAMBA_4_0/source/torture/local/local.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revprop:branch-nick
   - real4
   + SAMBA_4_0
Name: bzr:merge
...skipped...

Modified: branches/SAMBA_4_0/source/param/share.c
===================================================================
--- branches/SAMBA_4_0/source/param/share.c	2007-04-18 00:34:10 UTC (rev 22327)
+++ branches/SAMBA_4_0/source/param/share.c	2007-04-18 01:17:30 UTC (rev 22328)
@@ -131,11 +131,13 @@
 	return NT_STATUS_OK;
 }
 
-NTSTATUS share_get_context(TALLOC_CTX *mem_ctx, struct share_context **ctx)
+NTSTATUS share_get_context_by_name(TALLOC_CTX *mem_ctx, 
+								   const char *backend_name,
+								   struct share_context **ctx)
 {
 	const struct share_ops *ops;
 
-	ops = share_backend_by_name(lp_share_backend());
+	ops = share_backend_by_name(backend_name);
 	if (!ops) {
 		DEBUG(0, ("share_init_connection: share backend [%s] not found!\n", lp_share_backend()));
 		return NT_STATUS_INTERNAL_ERROR;
@@ -144,6 +146,11 @@
 	return ops->init(mem_ctx, ops, ctx);
 }
 
+NTSTATUS share_get_context(TALLOC_CTX *mem_ctx, struct share_context **ctx)
+{
+	return share_get_context_by_name(mem_ctx, lp_share_backend(), ctx);
+}
+
 /*
   initialise the SHARE subsystem
 */

Modified: branches/SAMBA_4_0/source/torture/local/config.mk
===================================================================
--- branches/SAMBA_4_0/source/torture/local/config.mk	2007-04-18 00:34:10 UTC (rev 22327)
+++ branches/SAMBA_4_0/source/torture/local/config.mk	2007-04-18 01:17:30 UTC (rev 22328)
@@ -32,6 +32,7 @@
 		sddl.o \
 		../../lib/tdr/testsuite.o \
 		event.o \
+		share.o \
 		local.o \
 		dbspeed.o \
 		torture.o
@@ -46,7 +47,8 @@
 		POPT_CREDENTIALS \
 		TORTURE_AUTH \
 		TORTURE_UTIL
-PRIVATE_DEPENDENCIES = TORTURE_NDR
+PRIVATE_DEPENDENCIES = TORTURE_NDR \
+					   share
 # End SUBSYSTEM TORTURE_LOCAL
 #################################
 

Modified: branches/SAMBA_4_0/source/torture/local/local.c
===================================================================
--- branches/SAMBA_4_0/source/torture/local/local.c	2007-04-18 00:34:10 UTC (rev 22327)
+++ branches/SAMBA_4_0/source/torture/local/local.c	2007-04-18 01:17:30 UTC (rev 22328)
@@ -45,6 +45,7 @@
 	torture_local_sddl,
 	torture_local_ndr, 
 	torture_local_tdr, 
+	torture_local_share,
 	torture_local_charset,
 	torture_local_compression,
 	torture_local_event, 

Added: branches/SAMBA_4_0/source/torture/local/share.c
===================================================================
--- branches/SAMBA_4_0/source/torture/local/share.c	2007-04-18 00:34:10 UTC (rev 22327)
+++ branches/SAMBA_4_0/source/torture/local/share.c	2007-04-18 01:17:30 UTC (rev 22328)
@@ -0,0 +1,79 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   local testing of share code
+
+   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 "param/share.h"
+#include "torture/torture.h"
+
+static bool test_list_empty(struct torture_context *tctx, 
+							void *tcase_data, 
+							void *test_data)
+{
+	struct share_context *ctx = tcase_data;
+	int count;
+	const char **names;
+
+	torture_assert_ntstatus_ok(tctx, share_list_all(tctx, ctx, &count, &names),
+							   "share_list_all failed");
+
+	return true;
+}
+
+static void tcase_add_share_tests(struct torture_tcase *tcase)
+{
+	torture_tcase_add_test(tcase, "list_empty", test_list_empty, NULL);
+}
+
+static BOOL setup_ldb(struct torture_context *tctx, void **data)
+{
+	return NT_STATUS_IS_OK(share_get_context_by_name(tctx, "ldb", data));
+}
+
+static BOOL setup_classic(struct torture_context *tctx, void **data)
+{
+	return NT_STATUS_IS_OK(share_get_context_by_name(tctx, "classic", data));
+}
+
+static BOOL teardown(struct torture_context *tctx, void *data)
+{
+	talloc_free(data);
+	return true;
+}
+
+struct torture_suite *torture_local_share(TALLOC_CTX *mem_ctx)
+{
+	struct torture_suite *suite = torture_suite_create(mem_ctx, 
+													   "SHARE");
+	struct torture_tcase *tcase;
+
+	share_init();
+
+	tcase = torture_suite_add_tcase(suite, "ldb");
+	torture_tcase_set_fixture(tcase, setup_ldb, teardown);
+	tcase_add_share_tests(tcase);
+
+	tcase = torture_suite_add_tcase(suite, "classic");
+	torture_tcase_set_fixture(tcase, setup_classic, teardown);
+	tcase_add_share_tests(tcase);
+
+	return suite;
+}



More information about the samba-cvs mailing list