Added return code to fixture functions so errors can be handled durin… (awslabs#585)

* Added return code to fixture functions so errors can be handled during setup and shutdown.

* Address pr feedback, the fixture teardown always runs now.

Co-authored-by: Michael Graeb <[email protected]>

Author: JonathanHenson

include/aws/testing/aws_test_harness.h

@@ -311,9 +311,9 @@ static int total_failures;
         }                                                                                                              \
     } while (0)
 
-typedef void(aws_test_before_fn)(struct aws_allocator *allocator, void *ctx);
+typedef int(aws_test_before_fn)(struct aws_allocator *allocator, void *ctx);
 typedef int(aws_test_run_fn)(struct aws_allocator *allocator, void *ctx);
-typedef void(aws_test_after_fn)(struct aws_allocator *allocator, void *ctx);
+typedef int(aws_test_after_fn)(struct aws_allocator *allocator, int setup_result, void *ctx);
 
 struct aws_test_harness {
     aws_test_before_fn *on_before;
@@ -378,17 +378,21 @@ static inline int s_aws_run_test_case(struct aws_test_harness *harness) {
     aws_logger_init_standard(&err_logger, aws_default_allocator(), &options);
     aws_logger_set(&err_logger);
 
+    int test_res = AWS_OP_ERR;
+    int setup_res = AWS_OP_SUCCESS;
     if (harness->on_before) {
-        harness->on_before(allocator, harness->ctx);
+        setup_res = harness->on_before(allocator, harness->ctx);
     }
 
-    int ret_val = harness->run(allocator, harness->ctx);
+    if (!setup_res) {
+        test_res = harness->run(allocator, harness->ctx);
+    }
 
     if (harness->on_after) {
-        harness->on_after(allocator, harness->ctx);
+        test_res |= harness->on_after(allocator, setup_res, harness->ctx);
     }
 
-    if (!ret_val) {
+    if (!test_res) {
         if (!harness->suppress_memcheck) {
             const size_t leaked_bytes = aws_mem_tracer_count(allocator);
             if (leaked_bytes) {
@@ -405,7 +409,7 @@ static inline int s_aws_run_test_case(struct aws_test_harness *harness) {
     aws_logger_set(NULL);
     aws_logger_clean_up(&err_logger);
 
-    if (!ret_val) {
+    if (!test_res) {
         RETURN_SUCCESS("%s [ \033[32mOK\033[0m ]", harness->test_name);
     } else {
         FAIL("%s [ \033[31mFAILED\033[0m ]", harness->test_name);
@@ -464,9 +468,9 @@ static inline int enable_vt_mode(void) {
     }
 
 #define AWS_TEST_CASE_FIXTURE_SUPPRESSION(name, b, fn, af, c, s)                                                       \
-    static void b(struct aws_allocator *allocator, void *ctx);                                                         \
+    static int b(struct aws_allocator *allocator, void *ctx);                                                          \
     static int fn(struct aws_allocator *allocator, void *ctx);                                                         \
-    static void af(struct aws_allocator *allocator, void *ctx);                                                        \
+    static int af(struct aws_allocator *allocator, int setup_result, void *ctx);                                       \
     static struct aws_test_harness name##_test = {                                                                     \
         b,                                                                                                             \
         fn,                                                                                                            \

tests/error_test.c

@@ -28,23 +28,28 @@ static struct aws_error_info_list s_errors_list = {
     .count = AWS_ARRAY_SIZE(s_errors),
 };
 
-static void s_setup_errors_test_fn(struct aws_allocator *allocator, void *ctx) {
+static int s_setup_errors_test_fn(struct aws_allocator *allocator, void *ctx) {
     (void)allocator;
     (void)ctx;
 
     aws_reset_error();
     aws_set_global_error_handler_fn(NULL, NULL);
     aws_set_thread_local_error_handler_fn(NULL, NULL);
     aws_register_error_info(&s_errors_list);
+
+    return AWS_OP_SUCCESS;
 }
 
-static void s_teardown_errors_test_fn(struct aws_allocator *allocator, void *ctx) {
+static int s_teardown_errors_test_fn(struct aws_allocator *allocator, int setup_res, void *ctx) {
     (void)allocator;
+    (void)setup_res;
     (void)ctx;
 
     aws_reset_error();
     aws_set_global_error_handler_fn(NULL, NULL);
     aws_set_thread_local_error_handler_fn(NULL, NULL);
+
+    return AWS_OP_SUCCESS;
 }
 
 static int s_raise_errors_test_fn(struct aws_allocator *allocator, void *ctx) {