diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-10-31 16:57:47 +1300 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-04-02 17:12:46 +0200 |
| commit | 2d2dbafd2b761d6ae554484a22283338da224f02 (patch) | |
| tree | fe8966951430d4f03d873bea573205287daef8a1 /source4 | |
| parent | 2acfba33c694f09f8e1af306c8b7c82967f275d0 (diff) | |
| download | samba-2d2dbafd2b761d6ae554484a22283338da224f02.tar.gz samba-2d2dbafd2b761d6ae554484a22283338da224f02.tar.xz samba-2d2dbafd2b761d6ae554484a22283338da224f02.zip | |
torture-samr: Make failures easier to trace with torture_assert
Change-Id: I729ba2f0a0501575357977754401a0cb40d95b34
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/torture/rpc/samr.c | 59 |
1 files changed, 17 insertions, 42 deletions
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index 27086ee3cd..dbd1314928 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -4890,57 +4890,32 @@ static bool test_user_ops(struct dcerpc_pipe *p, case TORTURE_SAMR_PASSWORDS_PWDLASTSET: /* test last password change timestamp behaviour */ - if (!test_SetPassword_pwdlastset(p, tctx, base_acct_flags, - base_acct_name, - user_handle, &password, - machine_credentials)) { - ret = false; - } - - if (ret == true) { - torture_comment(tctx, "pwdLastSet test succeeded\n"); - } else { - torture_result(tctx, TORTURE_FAIL, "pwdLastSet test failed\n"); - } - + torture_assert(tctx, test_SetPassword_pwdlastset(p, tctx, base_acct_flags, + base_acct_name, + user_handle, &password, + machine_credentials), + "pwdLastSet test failed\n"); break; case TORTURE_SAMR_PASSWORDS_BADPWDCOUNT: /* test bad pwd count change behaviour */ - if (!test_Password_badpwdcount_wrap(p, tctx, base_acct_flags, - base_acct_name, - domain_handle, - user_handle, &password, - machine_credentials)) { - ret = false; - } - - if (ret == true) { - torture_comment(tctx, "badPwdCount test succeeded\n"); - } else { - torture_result(tctx, TORTURE_FAIL, "badPwdCount test failed\n"); - } - + torture_assert(tctx, test_Password_badpwdcount_wrap(p, tctx, base_acct_flags, + base_acct_name, + domain_handle, + user_handle, &password, + machine_credentials), + "badPwdCount test failed\n"); break; case TORTURE_SAMR_PASSWORDS_LOCKOUT: - if (!test_Password_lockout_wrap(p, tctx, base_acct_flags, - base_acct_name, - domain_handle, - user_handle, &password, - machine_credentials)) - { - ret = false; - } - - if (ret == true) { - torture_comment(tctx, "lockout test succeeded\n"); - } else { - torture_result(tctx, TORTURE_FAIL, "lockout test failed\n"); - } - + torture_assert(tctx, test_Password_lockout_wrap(p, tctx, base_acct_flags, + base_acct_name, + domain_handle, + user_handle, &password, + machine_credentials), + "Lockout test failed"); break; |