At file:///home/jelmer/bzr.samba/SAMBA_4_0/
------------------------------------------------------------
revno: 11915
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Wed 2007-04-18 16:27:30 +0200
message:
Add some more share tests.
modified:
source/param/share_ldb.c svn-v2:[EMAIL PROTECTED]
source/torture/local/share.c svn-v2:[EMAIL PROTECTED]
=== modified file 'source/param/share_ldb.c'
--- a/source/param/share_ldb.c 2006-12-05 04:25:27 +0000
+++ b/source/param/share_ldb.c 2007-04-18 14:27:30 +0000
@@ -289,7 +289,7 @@
NTSTATUS ret;
int err, i, j;
- for (i = 0, j = 0; i < count || j != 0x03; i++) {
+ for (i = 0, j = 0; i < count && j != 0x03; i++) {
if (strcasecmp(info[i].name, SHARE_TYPE) == 0) j |= 0x02;
if (strcasecmp(info[i].name, SHARE_PATH) == 0) j |= 0x01;
if (strcasecmp(info[i].name, SHARE_NAME) == 0) {
=== modified file 'source/torture/local/share.c'
--- a/source/torture/local/share.c 2007-04-18 01:17:30 +0000
+++ b/source/torture/local/share.c 2007-04-18 14:27:30 +0000
@@ -25,15 +25,147 @@
#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");
+ const void *tcase_data,
+ const void *test_data)
+{
+ struct share_context *ctx = discard_const(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 bool test_create(struct torture_context *tctx,
+ const void *tcase_data,
+ const void *test_data)
+{
+ struct share_context *ctx = discard_const(tcase_data);
+ int count;
+ const char **names;
+ int i;
+ bool found = false;
+ struct share_info inf[] = {
+ { SHARE_INFO_STRING, SHARE_TYPE, discard_const_p(void *,
"IPC$") },
+ { SHARE_INFO_STRING, SHARE_PATH, discard_const_p(void *,
"/tmp/bla") }
+ };
+ NTSTATUS status;
+
+ status = share_create(ctx, "bloe", inf, 2);
+
+ if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED))
+ torture_skip(tctx, "Not supported by backend");
+
+ torture_assert_ntstatus_ok(tctx, status, "create_share failed");
+
+ torture_assert_ntstatus_ok(tctx, share_list_all(tctx, ctx, &count,
&names),
+ "share_list_all
failed");
+
+ torture_assert(tctx, count >= 1, "creating share failed");
+
+
+ for (i = 0; i < count; i++) {
+ found |= strcmp(names[i], "bloe") == 0;
+ }
+
+ torture_assert(tctx, found, "created share found");
+
+ return true;
+}
+
+
+static bool test_create_invalid(struct torture_context *tctx,
+ const void *tcase_data,
+ const void *test_data)
+{
+ struct share_context *ctx = discard_const(tcase_data);
+ NTSTATUS status;
+
+ status = share_create(ctx, "bla", NULL, 0);
+
+ if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED))
+ torture_skip(tctx, "Not supported by backend");
+
+ torture_assert_ntstatus_equal(tctx, NT_STATUS_INVALID_PARAMETER,
+ status,
+ "create_share
failed");
+
+ torture_assert_ntstatus_equal(tctx, NT_STATUS_INVALID_PARAMETER,
+
share_create(ctx, NULL, NULL, 0),
+ "create_share
failed");
+
+ return true;
+}
+
+static bool test_share_remove_invalid(struct torture_context *tctx,
+ const void *tcase_data,
+ const void *test_data)
+{
+ struct share_context *ctx = discard_const(tcase_data);
+ NTSTATUS status;
+
+ status = share_remove(ctx, "nonexistant");
+
+ if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED))
+ torture_skip(tctx, "Not supported by backend");
+
+ torture_assert_ntstatus_equal(ctx, status, NT_STATUS_UNSUCCESSFUL,
+ "remove
fails");
+
+ return true;
+}
+
+
+
+static bool test_share_remove(struct torture_context *tctx,
+ const void *tcase_data,
+ const void *test_data)
+{
+ struct share_context *ctx = discard_const(tcase_data);
+ struct share_info inf[] = {
+ { SHARE_INFO_STRING, SHARE_TYPE, discard_const_p(void *,
"IPC$") },
+ { SHARE_INFO_STRING, SHARE_PATH, discard_const_p(void *,
"/tmp/bla") }
+ };
+ NTSTATUS status;
+
+ status = share_create(ctx, "blie", inf, 2);
+
+ if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED))
+ torture_skip(tctx, "Not supported by backend");
+
+ torture_assert_ntstatus_ok(tctx, status,
+ "create_share
failed");
+
+ torture_assert_ntstatus_ok(tctx, share_remove(ctx, "blie"),
+ "remove failed");
+
+ return true;
+}
+
+static bool test_double_create(struct torture_context *tctx,
+ const void *tcase_data,
+ const void *test_data)
+{
+ struct share_context *ctx = discard_const(tcase_data);
+ struct share_info inf[] = {
+ { SHARE_INFO_STRING, SHARE_TYPE, discard_const_p(void *,
"IPC$") },
+ { SHARE_INFO_STRING, SHARE_PATH, discard_const_p(void *,
"/tmp/bla") }
+ };
+ NTSTATUS status;
+
+ status = share_create(ctx, "bla", inf, 2);
+
+ if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED))
+ torture_skip(tctx, "Not supported by backend");
+
+ torture_assert_ntstatus_ok(tctx, status,
+ "create_share
failed");
+
+ torture_assert_ntstatus_equal(tctx, NT_STATUS_UNSUCCESSFUL,
+
share_create(ctx, "bla", inf, 2),
+ "create_share
failed");
return true;
}
@@ -41,16 +173,22 @@
static void tcase_add_share_tests(struct torture_tcase *tcase)
{
torture_tcase_add_test(tcase, "list_empty", test_list_empty, NULL);
+ torture_tcase_add_test(tcase, "share_create", test_create, NULL);
+ torture_tcase_add_test(tcase, "share_remove", test_share_remove, NULL);
+ torture_tcase_add_test(tcase, "share_remove_invalid",
test_share_remove_invalid, NULL);
+ torture_tcase_add_test(tcase, "share_create_invalid",
test_create_invalid,
+ NULL);
+ torture_tcase_add_test(tcase, "share_double_create",
test_double_create, NULL);
}
static BOOL setup_ldb(struct torture_context *tctx, void **data)
{
- return NT_STATUS_IS_OK(share_get_context_by_name(tctx, "ldb", data));
+ return NT_STATUS_IS_OK(share_get_context_by_name(tctx, "ldb", (struct
share_context **)data));
}
static BOOL setup_classic(struct torture_context *tctx, void **data)
{
- return NT_STATUS_IS_OK(share_get_context_by_name(tctx, "classic",
data));
+ return NT_STATUS_IS_OK(share_get_context_by_name(tctx, "classic",
(struct share_context **)data));
}
static BOOL teardown(struct torture_context *tctx, void *data)
