We must use torture_assert() macros to ensure that the failure is
recorded in the subunit stream correctly, rather than being returned
as an unknown 'error'. (We cannot handle error results as knownfail).
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Thu Apr 26 04:00:16 CEST 2012 on sn-devel-104
int i;
int *count = talloc_zero(tctx, int);
int i;
int *count = talloc_zero(tctx, int);
- if (!torture_setup_dir(cli, BASEDIR)) {
- return false;
- }
-
data = talloc_array(tctx, uint8_t, len);
generate_random_buffer(data, len);
data = talloc_array(tctx, uint8_t, len);
generate_random_buffer(data, len);
static bool test_loadfile_t(struct torture_context *tctx, struct smbcli_state *cli)
{
int ret;
static bool test_loadfile_t(struct torture_context *tctx, struct smbcli_state *cli)
{
int ret;
- if (!torture_setup_dir(cli, BASEDIR)) {
- return false;
- }
+ torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "failed to setup " BASEDIR);
ret = test_loadfile(tctx, cli);
smb_raw_exit(cli->session);
ret = test_loadfile(tctx, cli);
smb_raw_exit(cli->session);
int *count = talloc_zero(tctx, int);
bool ret = true;
int *count = talloc_zero(tctx, int);
bool ret = true;
- if (!torture_setup_dir(cli, BASEDIR)) {
- return false;
- }
-
data = talloc_array(tctx, uint8_t, len);
generate_random_buffer(data, len);
data = talloc_array(tctx, uint8_t, len);
generate_random_buffer(data, len);
static bool test_fetchfile_t(struct torture_context *tctx, struct smbcli_state *cli)
{
int ret;
static bool test_fetchfile_t(struct torture_context *tctx, struct smbcli_state *cli)
{
int ret;
- if (!torture_setup_dir(cli, BASEDIR)) {
- return false;
- }
-
+ torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "failed to setup " BASEDIR);
ret = test_fetchfile(tctx, cli);
smb_raw_exit(cli->session);
smbcli_deltree(cli->tree, BASEDIR);
ret = test_fetchfile(tctx, cli);
smb_raw_exit(cli->session);
smbcli_deltree(cli->tree, BASEDIR);
- if (!torture_setup_dir(cli, BASEDIR)) {
- return false;
- }
-
io_orig = talloc_array(tctx, struct smb_composite_appendacl *, num_ops);
printf ("creating %d empty files and getting their acls with appendacl\n", num_ops);
io_orig = talloc_array(tctx, struct smb_composite_appendacl *, num_ops);
printf ("creating %d empty files and getting their acls with appendacl\n", num_ops);
io1.in.size = 0;
status = smb_composite_savefile(cli->tree, &io1);
io1.in.size = 0;
status = smb_composite_savefile(cli->tree, &io1);
- if (!NT_STATUS_IS_OK(status)) {
- torture_comment(tctx, "(%s) savefile failed: %s\n", __location__, nt_errstr(status));
- return false;
- }
+ torture_assert_ntstatus_equal(tctx, status, NT_STATUS_OK, "savefile failed");
io_orig[i] = talloc (io_orig, struct smb_composite_appendacl);
io_orig[i]->in.fname = talloc_steal(io_orig[i], io1.in.fname);
io_orig[i]->in.sd = security_descriptor_initialise(io_orig[i]);
status = smb_composite_appendacl(cli->tree, io_orig[i], io_orig[i]);
io_orig[i] = talloc (io_orig, struct smb_composite_appendacl);
io_orig[i]->in.fname = talloc_steal(io_orig[i], io1.in.fname);
io_orig[i]->in.sd = security_descriptor_initialise(io_orig[i]);
status = smb_composite_appendacl(cli->tree, io_orig[i], io_orig[i]);
- if (!NT_STATUS_IS_OK(status)) {
- torture_comment(tctx, "(%s) appendacl failed: %s\n", __location__, nt_errstr(status));
- return false;
- }
+ torture_assert_ntstatus_equal(tctx, status, NT_STATUS_OK, "appendacl failed");
ace->trustee = *test_sid;
status = security_descriptor_dacl_add(test_sd, ace);
ace->trustee = *test_sid;
status = security_descriptor_dacl_add(test_sd, ace);
- if (!NT_STATUS_IS_OK(status)) {
- torture_comment(tctx, "(%s) appendacl failed: %s\n", __location__, nt_errstr(status));
- return false;
- }
+ torture_assert_ntstatus_equal(tctx, status, NT_STATUS_OK, "appendacl failed");
/* set parameters for appendacl async call */
/* set parameters for appendacl async call */
static bool test_appendacl_t(struct torture_context *tctx, struct smbcli_state *cli)
{
int ret;
static bool test_appendacl_t(struct torture_context *tctx, struct smbcli_state *cli)
{
int ret;
- if (!torture_setup_dir(cli, BASEDIR)) {
- return false;
- }
-
+ torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "failed to setup " BASEDIR);
ret = test_appendacl(tctx, cli);
smb_raw_exit(cli->session);
smbcli_deltree(cli->tree, BASEDIR);
ret = test_appendacl(tctx, cli);
smb_raw_exit(cli->session);
smbcli_deltree(cli->tree, BASEDIR);
static bool test_fsinfo_t(struct torture_context *tctx, struct smbcli_state *cli)
{
int ret;
static bool test_fsinfo_t(struct torture_context *tctx, struct smbcli_state *cli)
{
int ret;
- if (!torture_setup_dir(cli, BASEDIR)) {
- return false;
- }
-
+ torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "failed to setup " BASEDIR);
ret = test_fsinfo(tctx, cli);
smb_raw_exit(cli->session);
smbcli_deltree(cli->tree, BASEDIR);
ret = test_fsinfo(tctx, cli);
smb_raw_exit(cli->session);
smbcli_deltree(cli->tree, BASEDIR);