Skip to content

Commit e7f3dfe

Browse files
authored
Net tests and new crash (#87)
* export symbol used in tests * Mark a few tls-using tests as net tests; fix crash on client creation failure due to tls init failure
1 parent e575343 commit e7f3dfe

2 files changed

Lines changed: 13 additions & 14 deletions

File tree

source/s3_client.c

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,17 @@ struct aws_s3_client *aws_s3_client_new(
213213

214214
aws_ref_count_init(&client->ref_count, client, (aws_simple_completion_callback *)s_s3_client_start_destroy);
215215

216+
aws_mutex_init(&client->synced_data.lock);
217+
218+
aws_linked_list_init(&client->synced_data.vips);
219+
aws_linked_list_init(&client->synced_data.pending_vip_connection_updates);
220+
aws_linked_list_init(&client->synced_data.pending_meta_request_work);
221+
222+
aws_linked_list_init(&client->threaded_data.idle_vip_connections);
223+
aws_linked_list_init(&client->threaded_data.meta_requests);
224+
216225
/* Store our client bootstrap. */
217-
client->client_bootstrap = client_config->client_bootstrap;
218-
aws_client_bootstrap_acquire(client_config->client_bootstrap);
226+
client->client_bootstrap = aws_client_bootstrap_acquire(client_config->client_bootstrap);
219227

220228
struct aws_event_loop_group *event_loop_group = client_config->client_bootstrap->event_loop_group;
221229
aws_event_loop_group_acquire(event_loop_group);
@@ -309,15 +317,6 @@ struct aws_s3_client *aws_s3_client_new(
309317
client->cached_signing_config = aws_cached_signing_config_new(client->allocator, client_config->signing_config);
310318
}
311319

312-
aws_mutex_init(&client->synced_data.lock);
313-
314-
aws_linked_list_init(&client->synced_data.vips);
315-
aws_linked_list_init(&client->synced_data.pending_vip_connection_updates);
316-
aws_linked_list_init(&client->synced_data.pending_meta_request_work);
317-
318-
aws_linked_list_init(&client->threaded_data.idle_vip_connections);
319-
aws_linked_list_init(&client->threaded_data.meta_requests);
320-
321320
client->synced_data.active = true;
322321

323322
if (client_config->retry_strategy != NULL) {

tests/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ file(GLOB TEST_SRC "*.c")
55
file(GLOB TEST_HDRS "*.h")
66
file(GLOB TESTS ${TEST_HDRS} ${TEST_SRC})
77

8-
add_test_case(test_s3_client_create_destroy)
8+
add_net_test_case(test_s3_client_create_destroy)
99
add_test_case(test_s3_request_create_destroy)
1010

1111
add_net_test_case(test_s3_client_exceed_retries)
@@ -16,8 +16,8 @@ add_net_test_case(test_s3_meta_request_sign_request_fail)
1616
add_net_test_case(test_s3_meta_request_send_request_finish_fail)
1717
add_net_test_case(test_s3_auto_range_put_missing_upload_id)
1818

19-
add_test_case(test_s3_vip_create_destroy)
20-
add_test_case(test_s3_client_add_remove_vips)
19+
add_net_test_case(test_s3_vip_create_destroy)
20+
add_net_test_case(test_s3_client_add_remove_vips)
2121
add_net_test_case(test_s3_client_resolve_vips)
2222

2323
add_net_test_case(test_s3_get_object_tls_disabled)

0 commit comments

Comments
 (0)