diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-05-18 15:43:31 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-05-18 09:35:13 +0200 |
| commit | 45082a88c7aaaa928ca36003ade071aafe4de54d (patch) | |
| tree | 2800e5aaff2da77f5156e12a8bba5e765e794e35 /source4/torture/raw/read.c | |
| parent | 8c52d1b8ac7d56eb728e4cc4ed2a560365d374b5 (diff) | |
| download | samba-45082a88c7aaaa928ca36003ade071aafe4de54d.tar.gz samba-45082a88c7aaaa928ca36003ade071aafe4de54d.tar.bz2 samba-45082a88c7aaaa928ca36003ade071aafe4de54d.zip | |
s4-torture: Improve torture test boilerplate, use torture_assert()
This ensures that if this fails, it is reported as a subunit error correctly.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri May 18 09:35:13 CEST 2012 on sn-devel-104
Diffstat (limited to 'source4/torture/raw/read.c')
| -rw-r--r-- | source4/torture/raw/read.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c index 9bb626f3cd..6586177e3e 100644 --- a/source4/torture/raw/read.c +++ b/source4/torture/raw/read.c @@ -100,9 +100,7 @@ static bool test_read(struct torture_context *tctx, struct smbcli_state *cli) return true; } - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); printf("Testing RAW_READ_READ\n"); io.generic.level = RAW_READ_READ; @@ -232,9 +230,7 @@ static bool test_lockread(struct torture_context *tctx, buf = talloc_zero_array(tctx, uint8_t, maxsize); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); printf("Testing RAW_READ_LOCKREAD\n"); io.generic.level = RAW_READ_LOCKREAD; @@ -377,9 +373,7 @@ static bool test_readx(struct torture_context *tctx, struct smbcli_state *cli) buf = talloc_zero_array(tctx, uint8_t, maxsize); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); printf("Testing RAW_READ_READX\n"); @@ -665,9 +659,7 @@ static bool test_readbraw(struct torture_context *tctx, buf = talloc_zero_array(tctx, uint8_t, maxsize); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); printf("Testing RAW_READ_READBRAW\n"); @@ -839,9 +831,7 @@ static bool test_read_for_execute(struct torture_context *tctx, buf = talloc_zero_array(tctx, uint8_t, maxsize); - if (!torture_setup_dir(cli, BASEDIR)) { - return false; - } + torture_assert(tctx, torture_setup_dir(cli, BASEDIR), "Failed to setup up test directory: " BASEDIR); printf("Testing RAW_READ_READX with read_for_execute\n"); |