tdb2: consolidate testing failtest suppression routines.

Less cut & paste means less patching as failtest changes.

diff --git a/ccan/tdb2/test/failtest_helper.c b/ccan/tdb2/test/failtest_helper.c
index 1358a6c6b261d3b296a296d123c36693afe07ff1..d24ac4c42b11077693f5126293e095eb2963e4ea 100644 (file)
--- a/ccan/tdb2/test/failtest_helper.c
+++ b/ccan/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/ccan/tdb2/test/failtest_helper.h b/ccan/tdb2/test/failtest_helper.h
index 02acac8c3cf493a0bd64316651cefb25d810f78b..7f912bb5e9146ba312f90ec904e1c9ff6641a278 100644 (file)
--- a/ccan/tdb2/test/failtest_helper.h
+++ b/ccan/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/ccan/tdb2/test/run-01-new_database.c b/ccan/tdb2/test/run-01-new_database.c
index 7b5a57df529ee61ba7f09942ff3effbb62c3491b..a5f0dd3727edb25bd3ecdde209a38bd87e8dc4eb 100644 (file)
--- a/ccan/tdb2/test/run-01-new_database.c
+++ b/ccan/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/ccan/tdb2/test/run-02-expand.c b/ccan/tdb2/test/run-02-expand.c
index f3c3d4d4a25a73d6131b15d0c9d6e6a3742c6dfb..e3f5905aec6977a524746639774654939de2b485 100644 (file)
--- a/ccan/tdb2/test/run-02-expand.c
+++ b/ccan/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/ccan/tdb2/test/run-05-readonly-open.c b/ccan/tdb2/test/run-05-readonly-open.c
index c4776f53b23651771175f596d1930605b11f7012..80eb56759b703b95b866424b43e3c69b830af97c 100644 (file)
--- a/ccan/tdb2/test/run-05-readonly-open.c
+++ b/ccan/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/ccan/tdb2/test/run-10-simple-store.c b/ccan/tdb2/test/run-10-simple-store.c
index ac08548c422dc489310b8397f9183879827ec12b..10bbb498898aab030972e7884a67bb98368038a0 100644 (file)
--- a/ccan/tdb2/test/run-10-simple-store.c
+++ b/ccan/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/ccan/tdb2/test/run-11-simple-fetch.c b/ccan/tdb2/test/run-11-simple-fetch.c
index 517d64dc8b7ba1073b6dcbc706b0bea6d852d4b0..7908794171f732667443aa454b2e10e8491ec040 100644 (file)
--- a/ccan/tdb2/test/run-11-simple-fetch.c
+++ b/ccan/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/ccan/tdb2/test/run-12-check.c b/ccan/tdb2/test/run-12-check.c
index 06abe422ab436e1198e9625ef48f8b1eb7af39f1..b55bfe7d46384e5f041d6c83f9f9c9360e7a757a 100644 (file)
--- a/ccan/tdb2/test/run-12-check.c
+++ b/ccan/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;