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)

1 files changed, 2 insertions, 14 deletions

diff --git a/source4/torture/basic/properties.c b/source4/torture/basic/properties.c
index 63941263ae..6b0b61419b 100644
--- a/source4/torture/basic/properties.c
+++ b/source4/torture/basic/properties.c
@@ -89,21 +89,13 @@ static void show_bits(const struct bitmapping *bm, uint32_t value)
 /*
   print out server properties
  */
-BOOL torture_test_properties(struct torture_context *torture)
+BOOL torture_test_properties(struct torture_context *torture, 
+							 struct smbcli_state *cli)
 {
-	struct smbcli_state *cli;
 	BOOL correct = True;
 	union smb_fsinfo fs;
 	NTSTATUS status;
 	
-	printf("starting properties test\n");
-	
-	ZERO_STRUCT(cli);
-
-	if (!torture_open_connection(&cli, 0)) {
-		return False;
-	}
-	
 	d_printf("Capabilities: 0x%08x\n", cli->transport->negotiate.capabilities);
 	show_bits(capability_bits, cli->transport->negotiate.capabilities);
 	d_printf("\n");
@@ -122,10 +114,6 @@ BOOL torture_test_properties(struct torture_context *torture)
 		d_printf("fstype: %s\n", fs.attribute_info.out.fs_type.s);
 	}
 
-	if (!torture_close_connection(cli)) {
-		correct = False;
-	}
-
 	return correct;
 }