diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-08-28 12:54:27 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:03:00 -0500 |
| commit | 919aa6b27e5fe49b70c814210aa026c19be66e8a (patch) | |
| tree | 4f1cff79459133a014a32e3f42fa787c7d83de67 /source4/torture/raw/mux.c | |
| parent | b42691ee167415c7dc89d50b4ba18909bacd40c1 (diff) | |
| download | samba-919aa6b27e5fe49b70c814210aa026c19be66e8a.tar.gz samba-919aa6b27e5fe49b70c814210aa026c19be66e8a.tar.bz2 samba-919aa6b27e5fe49b70c814210aa026c19be66e8a.zip | |
r24735: Use torture API in more places.
(This used to be commit 1319d88c099496be29dd9214fa2492c81e848369)
Diffstat (limited to 'source4/torture/raw/mux.c')
| -rw-r--r-- | source4/torture/raw/mux.c | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/source4/torture/raw/mux.c b/source4/torture/raw/mux.c index d61d037239..b67d756ed9 100644 --- a/source4/torture/raw/mux.c +++ b/source4/torture/raw/mux.c @@ -342,37 +342,19 @@ done: /* basic testing of multiplexing notify */ -BOOL torture_raw_mux(struct torture_context *torture) +bool torture_raw_mux(struct torture_context *torture, struct smbcli_state *cli) { - struct smbcli_state *cli; - BOOL ret = True; - TALLOC_CTX *mem_ctx; + bool ret = true; - if (!torture_open_connection(&cli, 0)) { - return False; - } - - mem_ctx = talloc_init("torture_raw_mux"); - if (!torture_setup_dir(cli, BASEDIR)) { - return False; - } - - if (!test_mux_open(cli, mem_ctx)) { - ret = False; - } - - if (!test_mux_write(cli, mem_ctx)) { - ret = False; + return false; } - if (!test_mux_lock(cli, mem_ctx)) { - ret = False; - } + ret &= test_mux_open(cli, torture); + ret &= test_mux_write(cli, torture); + ret &= test_mux_lock(cli, torture); smb_raw_exit(cli->session); smbcli_deltree(cli->tree, BASEDIR); - torture_close_connection(cli); - talloc_free(mem_ctx); return ret; } |