Rev 11885: Fix LOCAL-TORTURE (now tested else). in
file:///home/jelmer/bzr.samba/SAMBA_4_0/
Jelmer Vernooij
jelmer at samba.org
Tue Apr 17 01:16:51 GMT 2007
At file:///home/jelmer/bzr.samba/SAMBA_4_0/
------------------------------------------------------------
revno: 11885
revision-id: jelmer at samba.org-20070417011632-cl2o439n94bit63x
parent: jelmer at samba.org-20070417010855-8a7r14tmvje1yn44
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Tue 2007-04-17 03:16:32 +0200
message:
Fix LOCAL-TORTURE (now tested else).
modified:
source/torture/local/torture.c svn-v2:16518 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2flocal%2ftorture.c
source/torture/util.c svn-v2:16518 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2futil.c
=== modified file 'source/torture/local/torture.c'
--- a/source/torture/local/torture.c 2007-04-16 20:35:19 +0000
+++ b/source/torture/local/torture.c 2007-04-17 01:16:32 +0000
@@ -40,44 +40,12 @@
return true;
}
-static bool test_setup_server(struct torture_context *tctx)
-{
- pid_t pid;
- TALLOC_CTX *mem_ctx = tctx;
-
- torture_assert_ntstatus_ok(tctx, torture_setup_server(mem_ctx,
- "setupserver-success",
- "./script/tests/mksamba4server.pl",
- "./bin/smbd", &pid),
- "starting smbd failed");
-
- torture_assert(tctx, pid > 0, "Pid invalid");
-
- torture_comment(tctx, "Created smbd with pid %d\n", pid);
-
- kill(pid, SIGINT);
-
- waitpid(pid, NULL, 0);
-
- torture_assert_ntstatus_equal(tctx, torture_setup_server(mem_ctx,
- "setupserver-fail",
- "./invalid-script",
- "./bin/smbd", &pid),
- NT_STATUS_UNSUCCESSFUL,
- "invalid script specified");
-
- torture_assert(tctx, pid == -1, "Pid not -1 after failure");
- return true;
-}
-
-
struct torture_suite *torture_local_torture(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx,
"TORTURE");
torture_suite_add_simple_test(suite, "tempdir", test_tempdir);
- torture_suite_add_simple_test(suite, "setup server", test_setup_server);
return suite;
}
=== modified file 'source/torture/util.c'
--- a/source/torture/util.c 2007-04-16 10:04:39 +0000
+++ b/source/torture/util.c 2007-04-17 01:16:32 +0000
@@ -50,77 +50,6 @@
return *t1 == *t2;
}
-/**
- * Provision a Samba installation using @param setupdir_script and start smbd.
- */
-NTSTATUS torture_setup_server(TALLOC_CTX *mem_ctx,
- const char *prefix,
- const char *setupdir_script,
- const char *smbd_path,
- pid_t *smbd_pid)
-{
- char *tempdir;
- NTSTATUS status;
- pid_t pid;
- int child_status;
- char *configfile, *configparam;
- pid_t closed_pid;
-
- *smbd_pid = -1;
-
- status = torture_temp_dir(mem_ctx, prefix, &tempdir);
- if (NT_STATUS_IS_ERR(status)) {
- return status;
- }
-
- if ((pid = fork()) == 0) {
- execl(setupdir_script, setupdir_script, tempdir, NULL);
- exit(1);
- } else if (pid == -1) {
- DEBUG(0, ("Unable to fork()\n"));
- return NT_STATUS_UNSUCCESSFUL;
- }
-
- closed_pid = waitpid(pid, &child_status, 0);
-
- if (closed_pid == -1) {
- DEBUG(1, ("Error waiting for child"));
- return NT_STATUS_UNSUCCESSFUL;
- }
-
- SMB_ASSERT(closed_pid == pid);
-
- if (!WIFEXITED(child_status) || WEXITSTATUS(child_status) != 0) {
- DEBUG(1, ("Invalid return code from setup script %s: %d\n",
- setupdir_script,
- WEXITSTATUS(child_status)));
- return NT_STATUS_UNSUCCESSFUL;
- }
-
- configfile = talloc_asprintf(mem_ctx, "%s/etc/smb.conf",
- tempdir);
- if (!file_exist(configfile)) {
- DEBUG(1, ("Setup script didn't create %s\n", configfile));
- return NT_STATUS_UNSUCCESSFUL;
- }
-
- configparam = talloc_asprintf(mem_ctx, "--configfile=%s", configfile);
- talloc_free(configfile);
-
- if ((pid = fork()) == 0) {
- execl(smbd_path, smbd_path, "-i", "--model=single",
- configparam, NULL);
- exit(1);
- } else if (pid == -1) {
- DEBUG(0, ("Unable to fork()\n"));
- return NT_STATUS_UNSUCCESSFUL;
- }
-
- *smbd_pid = pid;
-
- return NT_STATUS_OK;
-}
-
NTSTATUS torture_second_tcon(TALLOC_CTX *mem_ctx,
struct smbcli_session *session,
const char *sharename,
More information about the samba-cvs
mailing list