From 8773e743c518578584d07d35ffdafdd598af88b0 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 16 Oct 2006 13:06:41 +0000 Subject: r19339: Merge my 4.0-unittest branch. This adds an API for more fine-grained output in the testsuite rather than just True or False for a set of tests. The aim is to use this for: * known failure lists (run all tests and detect tests that started working or started failing). This would allow us to get rid of the RPC-SAMBA3-* tests * nicer torture output * simplification of the testsuite system * compatibility with other unit testing systems * easier usage of smbtorture (being able to run one test and automatically set up the environment for that) This is still a work-in-progress; expect more updates over the next couple of days. (This used to be commit 0eb6097305776325c75081356309115f445a7218) --- source4/torture/basic/scanner.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'source4/torture/basic/scanner.c') diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c index 47da8f7efe..60cfacd840 100644 --- a/source4/torture/basic/scanner.c +++ b/source4/torture/basic/scanner.c @@ -242,19 +242,13 @@ static BOOL scan_trans2(struct smbcli_state *cli, int op, int level, } -BOOL torture_trans2_scan(struct torture_context *torture) +BOOL torture_trans2_scan(struct torture_context *torture, + struct smbcli_state *cli) { - static struct smbcli_state *cli; int op, level; const char *fname = "\\scanner.dat"; int fnum, dnum, qfnum; - printf("starting trans2 scan test\n"); - - if (!torture_open_connection(&cli, 0)) { - return False; - } - fnum = smbcli_open(cli->tree, fname, O_RDWR | O_CREAT | O_TRUNC, DENY_NONE); if (fnum == -1) { printf("file open failed - %s\n", smbcli_errstr(cli->tree)); @@ -299,9 +293,6 @@ BOOL torture_trans2_scan(struct torture_context *torture) } } - torture_close_connection(cli); - - printf("trans2 scan finished\n"); return True; } @@ -483,19 +474,13 @@ static BOOL scan_nttrans(struct smbcli_state *cli, int op, int level, } -BOOL torture_nttrans_scan(struct torture_context *torture) +BOOL torture_nttrans_scan(struct torture_context *torture, + struct smbcli_state *cli) { - static struct smbcli_state *cli; int op, level; const char *fname = "\\scanner.dat"; int fnum, dnum; - printf("starting nttrans scan test\n"); - - if (!torture_open_connection(&cli, 0)) { - return False; - } - fnum = smbcli_open(cli->tree, fname, O_RDWR | O_CREAT | O_TRUNC, DENY_NONE); dnum = smbcli_open(cli->tree, "\\", O_RDONLY, DENY_NONE); -- cgit