summaryrefslogtreecommitdiff
path: root/lib/tdb2
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2011-12-05 17:03:19 +1030
committerRusty Russell <rusty@rustcorp.com.au>2011-12-05 17:03:19 +1030
commit7f95ad045a36f1d40f66c815c9461bd5720c5808 (patch)
treec07bd21df5f33a5143bcbe0a3288b7b0f1cfb435 /lib/tdb2
parentd5524222a42a9dd92f9ea25ced4b70d2a8da1b23 (diff)
downloadsamba-7f95ad045a36f1d40f66c815c9461bd5720c5808.tar.gz
samba-7f95ad045a36f1d40f66c815c9461bd5720c5808.tar.bz2
samba-7f95ad045a36f1d40f66c815c9461bd5720c5808.zip
tdb2: consolidate testing failtest suppression routines.
Less cut & paste means less patching as failtest changes. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (Imported from CCAN commit 1819a36a3e69565bd7b853503fceb846558a45bd)
Diffstat (limited to 'lib/tdb2')
-rw-r--r--lib/tdb2/test/failtest_helper.c5
-rw-r--r--lib/tdb2/test/failtest_helper.h3
-rw-r--r--lib/tdb2/test/run-01-new_database.c13
-rw-r--r--lib/tdb2/test/run-02-expand.c13
-rw-r--r--lib/tdb2/test/run-05-readonly-open.c13
-rw-r--r--lib/tdb2/test/run-10-simple-store.c13
-rw-r--r--lib/tdb2/test/run-11-simple-fetch.c13
-rw-r--r--lib/tdb2/test/run-12-check.c13
8 files changed, 14 insertions, 72 deletions
diff --git a/lib/tdb2/test/failtest_helper.c b/lib/tdb2/test/failtest_helper.c
index 1358a6c6b2..d24ac4c42b 100644
--- a/lib/tdb2/test/failtest_helper.c
+++ b/lib/tdb2/test/failtest_helper.c
@@ -3,6 +3,8 @@
#include <string.h>
#include <ccan/tap/tap.h>
+bool failtest_suppress = false;
+
/* FIXME: From ccan/str */
static inline bool strends(const char *str, const char *postfix)
{
@@ -84,6 +86,9 @@ block_repeat_failures(struct failtest_call *history, unsigned num)
{
const struct failtest_call *i, *last = &history[num-1];
+ if (failtest_suppress)
+ return FAIL_DONT_FAIL;
+
if (failmatch(last, INITIAL_TDB_MALLOC)
|| failmatch(last, URANDOM_OPEN)
|| failmatch(last, URANDOM_READ)) {
diff --git a/lib/tdb2/test/failtest_helper.h b/lib/tdb2/test/failtest_helper.h
index 02acac8c3c..7f912bb5e9 100644
--- a/lib/tdb2/test/failtest_helper.h
+++ b/lib/tdb2/test/failtest_helper.h
@@ -14,4 +14,7 @@ bool failmatch(const struct failtest_call *call,
enum failtest_result
block_repeat_failures(struct failtest_call *history, unsigned num);
+/* Set this to suppress failure. */
+extern bool failtest_suppress;
+
#endif /* TDB2_TEST_LOGGING_H */
diff --git a/lib/tdb2/test/run-01-new_database.c b/lib/tdb2/test/run-01-new_database.c
index 07a9703533..e08e3201e6 100644
--- a/lib/tdb2/test/run-01-new_database.c
+++ b/lib/tdb2/test/run-01-new_database.c
@@ -5,17 +5,6 @@
#include "logging.h"
#include "failtest_helper.h"
-static bool failtest_suppress = false;
-
-/* Don't need to test everything here, just want expand testing. */
-static enum failtest_result
-suppress_failure(struct failtest_call *history, unsigned num)
-{
- if (failtest_suppress)
- return FAIL_DONT_FAIL;
- return block_repeat_failures(history, num);
-}
-
int main(int argc, char *argv[])
{
unsigned int i;
@@ -30,7 +19,7 @@ int main(int argc, char *argv[])
TDB_NOMMAP|TDB_CONVERT|TDB_VERSION1 };
failtest_init(argc, argv);
- failtest_hook = suppress_failure;
+ failtest_hook = block_repeat_failures;
failtest_exit_check = exit_check_log;
plan_tests(sizeof(flags) / sizeof(flags[0]) * 3);
for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
diff --git a/lib/tdb2/test/run-02-expand.c b/lib/tdb2/test/run-02-expand.c
index 192a3547d8..dacf5f2194 100644
--- a/lib/tdb2/test/run-02-expand.c
+++ b/lib/tdb2/test/run-02-expand.c
@@ -5,17 +5,6 @@
#include "logging.h"
#include "failtest_helper.h"
-static bool failtest_suppress = false;
-
-/* Don't need to test everything here, just want expand testing. */
-static enum failtest_result
-suppress_failure(struct failtest_call *history, unsigned num)
-{
- if (failtest_suppress)
- return FAIL_DONT_FAIL;
- return block_repeat_failures(history, num);
-}
-
int main(int argc, char *argv[])
{
unsigned int i;
@@ -28,7 +17,7 @@ int main(int argc, char *argv[])
plan_tests(sizeof(flags) / sizeof(flags[0]) * 11 + 1);
failtest_init(argc, argv);
- failtest_hook = suppress_failure;
+ failtest_hook = block_repeat_failures;
failtest_exit_check = exit_check_log;
for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
diff --git a/lib/tdb2/test/run-05-readonly-open.c b/lib/tdb2/test/run-05-readonly-open.c
index c4776f53b2..80eb56759b 100644
--- a/lib/tdb2/test/run-05-readonly-open.c
+++ b/lib/tdb2/test/run-05-readonly-open.c
@@ -5,17 +5,6 @@
#include "logging.h"
#include "failtest_helper.h"
-static bool failtest_suppress = false;
-
-/* Don't need to test everything here, just want expand testing. */
-static enum failtest_result
-suppress_failure(struct failtest_call *history, unsigned num)
-{
- if (failtest_suppress)
- return FAIL_DONT_FAIL;
- return block_repeat_failures(history, num);
-}
-
int main(int argc, char *argv[])
{
unsigned int i;
@@ -31,7 +20,7 @@ int main(int argc, char *argv[])
unsigned int msgs = 0;
failtest_init(argc, argv);
- failtest_hook = suppress_failure;
+ failtest_hook = block_repeat_failures;
failtest_exit_check = exit_check_log;
seed_attr.base.attr = TDB_ATTRIBUTE_SEED;
diff --git a/lib/tdb2/test/run-10-simple-store.c b/lib/tdb2/test/run-10-simple-store.c
index bedb64baf0..b195d80ab1 100644
--- a/lib/tdb2/test/run-10-simple-store.c
+++ b/lib/tdb2/test/run-10-simple-store.c
@@ -5,17 +5,6 @@
#include "logging.h"
#include "failtest_helper.h"
-static bool failtest_suppress = false;
-
-/* Don't need to test everything here, just want expand testing. */
-static enum failtest_result
-suppress_failure(struct failtest_call *history, unsigned num)
-{
- if (failtest_suppress)
- return FAIL_DONT_FAIL;
- return block_repeat_failures(history, num);
-}
-
int main(int argc, char *argv[])
{
unsigned int i;
@@ -32,7 +21,7 @@ int main(int argc, char *argv[])
struct tdb_data data = tdb_mkdata("data", 4);
failtest_init(argc, argv);
- failtest_hook = suppress_failure;
+ failtest_hook = block_repeat_failures;
failtest_exit_check = exit_check_log;
failtest_suppress = true;
diff --git a/lib/tdb2/test/run-11-simple-fetch.c b/lib/tdb2/test/run-11-simple-fetch.c
index bb06000ef7..8681eef22c 100644
--- a/lib/tdb2/test/run-11-simple-fetch.c
+++ b/lib/tdb2/test/run-11-simple-fetch.c
@@ -5,17 +5,6 @@
#include "logging.h"
#include "failtest_helper.h"
-static bool failtest_suppress = false;
-
-/* Don't need to test everything here, just want fetch testing. */
-static enum failtest_result
-suppress_failure(struct failtest_call *history, unsigned num)
-{
- if (failtest_suppress)
- return FAIL_DONT_FAIL;
- return block_repeat_failures(history, num);
-}
-
int main(int argc, char *argv[])
{
unsigned int i;
@@ -32,7 +21,7 @@ int main(int argc, char *argv[])
struct tdb_data data = tdb_mkdata("data", 4);
failtest_init(argc, argv);
- failtest_hook = suppress_failure;
+ failtest_hook = block_repeat_failures;
failtest_exit_check = exit_check_log;
failtest_suppress = true;
diff --git a/lib/tdb2/test/run-12-check.c b/lib/tdb2/test/run-12-check.c
index 06abe422ab..b55bfe7d46 100644
--- a/lib/tdb2/test/run-12-check.c
+++ b/lib/tdb2/test/run-12-check.c
@@ -6,17 +6,6 @@
#include "logging.h"
#include "failtest_helper.h"
-static bool failtest_suppress = false;
-
-/* Don't need to test everything here, just want expand testing. */
-static enum failtest_result
-suppress_failure(struct failtest_call *history, unsigned num)
-{
- if (failtest_suppress)
- return FAIL_DONT_FAIL;
- return block_repeat_failures(history, num);
-}
-
int main(int argc, char *argv[])
{
unsigned int i;
@@ -32,7 +21,7 @@ int main(int argc, char *argv[])
struct tdb_data data = tdb_mkdata("data", 4);
failtest_init(argc, argv);
- failtest_hook = suppress_failure;
+ failtest_hook = block_repeat_failures;
failtest_exit_check = exit_check_log;
failtest_suppress = true;