diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2012-02-22 15:03:37 +1030 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2012-03-07 13:16:16 +1100 |
| commit | 9d897b0951e73a4717ae133d5b6b2493334fbf22 (patch) | |
| tree | c3fcbe7b449f1384da2d132110ebfbfedce8fd3b /lib/tdb2/test/external-agent.c | |
| parent | 361f3ea9ee577c5a3e2fed687a0b417b257c31de (diff) | |
| download | samba-9d897b0951e73a4717ae133d5b6b2493334fbf22.tar.gz samba-9d897b0951e73a4717ae133d5b6b2493334fbf22.tar.bz2 samba-9d897b0951e73a4717ae133d5b6b2493334fbf22.zip | |
lib/tdb2: adapt unit tests to SAMBA environment.
This means changing headers, implementing a simple tap-like wrapper,
and also splitting out the helpers into those which are linked with
the api* tests (which can't use non-public tdb2 functions) and those
linked with the run* tests (which can).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'lib/tdb2/test/external-agent.c')
| -rw-r--r-- | lib/tdb2/test/external-agent.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/tdb2/test/external-agent.c b/lib/tdb2/test/external-agent.c index 01c7106fba..9d50e8fa85 100644 --- a/lib/tdb2/test/external-agent.c +++ b/lib/tdb2/test/external-agent.c @@ -10,8 +10,7 @@ #include <limits.h> #include <string.h> #include <errno.h> -#include <ccan/tdb2/tdb1_private.h> -#include <ccan/tap/tap.h> +#include "tap-interface.h" #include <stdio.h> #include <stdarg.h> @@ -65,7 +64,7 @@ static enum agent_return do_operation(enum operation op, const char *name) switch (op) { case OPEN: if (tdb) { - diag("Already have tdb %s open", tdb->name); + diag("Already have tdb %s open", tdb_name(tdb)); return OTHER_FAILURE; } tdb = tdb_open(name, TDB_DEFAULT, O_RDWR, 0, &tap_log_attr); @@ -79,7 +78,7 @@ static enum agent_return do_operation(enum operation op, const char *name) break; case OPEN_WITH_HOOK: if (tdb) { - diag("Already have tdb %s open", tdb->name); + diag("Already have tdb %s open", tdb_name(tdb)); return OTHER_FAILURE; } cif.openhook.base.attr = TDB_ATTRIBUTE_OPENHOOK; @@ -118,10 +117,7 @@ static enum agent_return do_operation(enum operation op, const char *name) ret = tdb_transaction_commit(tdb)==0 ? SUCCESS : OTHER_FAILURE; break; case NEEDS_RECOVERY: - if (tdb->flags & TDB_VERSION1) - ret = tdb1_needs_recovery(tdb) ? SUCCESS : FAILED; - else - ret = tdb_needs_recovery(tdb) ? SUCCESS : FAILED; + ret = external_agent_needs_rec(tdb); break; case CHECK: ret = tdb_check(tdb, NULL, NULL) == 0 ? SUCCESS : OTHER_FAILURE; |