Partially fix connection_setup_shutdown test (#28)

Fix some race-conditions in test, but leave it commented out. There are still server-bootstrap shutdown issues that appear regularly in x86 builds.
awslabs · Apr 4, 2019 · 3c0cbee · 3c0cbee
1 parent 549aff6
commit 3c0cbee
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/tests/test_connection.c b/tests/test_connection.c
@@ -81,8 +81,11 @@ static void s_tester_on_server_connection_shutdown(
     (void)connection;
     (void)error_code;
     struct tester *tester = user_data;
+    AWS_FATAL_ASSERT(aws_mutex_lock(&tester->wait_lock) == AWS_OP_SUCCESS);
 
     tester->server_connection_is_shutdown = true;
+
+    AWS_FATAL_ASSERT(aws_mutex_unlock(&tester->wait_lock) == AWS_OP_SUCCESS);
     aws_condition_variable_notify_one(&tester->wait_cvar);
 }
 
@@ -94,6 +97,7 @@ static void s_tester_on_server_connection_setup(
 
     (void)server;
     struct tester *tester = user_data;
+    AWS_FATAL_ASSERT(aws_mutex_lock(&tester->wait_lock) == AWS_OP_SUCCESS);
 
     if (error_code) {
         tester->wait_result = error_code;
@@ -113,6 +117,7 @@ static void s_tester_on_server_connection_setup(
 
     tester->server_connection = connection;
 done:
+    AWS_FATAL_ASSERT(aws_mutex_unlock(&tester->wait_lock) == AWS_OP_SUCCESS);
     aws_condition_variable_notify_one(&tester->wait_cvar);
 }
 
@@ -122,13 +127,16 @@ static void s_tester_on_client_connection_setup(
     void *user_data) {
 
     struct tester *tester = user_data;
+    AWS_FATAL_ASSERT(aws_mutex_lock(&tester->wait_lock) == AWS_OP_SUCCESS);
+
     if (error_code) {
         tester->wait_result = error_code;
         goto done;
     }
 
     tester->client_connection = connection;
 done:
+    AWS_FATAL_ASSERT(aws_mutex_unlock(&tester->wait_lock) == AWS_OP_SUCCESS);
     aws_condition_variable_notify_one(&tester->wait_cvar);
 }
 
@@ -140,8 +148,11 @@ static void s_tester_on_client_connection_shutdown(
     (void)connection;
     (void)error_code;
     struct tester *tester = user_data;
+    AWS_FATAL_ASSERT(aws_mutex_lock(&tester->wait_lock) == AWS_OP_SUCCESS);
 
     tester->client_connection_is_shutdown = true;
+
+    AWS_FATAL_ASSERT(aws_mutex_unlock(&tester->wait_lock) == AWS_OP_SUCCESS);
     aws_condition_variable_notify_one(&tester->wait_cvar);
 }