File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -206,6 +206,8 @@ jobs:
206206 runs-on : macos-14
207207 strategy :
208208 fail-fast : false
209+ matrix :
210+ eventloop : ["kqueue", "dispatch_queue"]
209211 steps :
210212 - uses : aws-actions/configure-aws-credentials@v4
211213 with :
@@ -248,6 +250,8 @@ jobs:
248250 runs-on : macos-14
249251 strategy :
250252 fail-fast : false
253+ matrix :
254+ eventloop : ["kqueue", "dispatch_queue"]
251255 steps :
252256 - uses : aws-actions/configure-aws-credentials@v4
253257 with :
Original file line number Diff line number Diff line change @@ -735,11 +735,14 @@ static int s_test_connection_customized_alpn_error_with_unknown_return_string(
735735 tester .wait_client_connection_num = 1 ;
736736 tester .wait_server_connection_num = 1 ;
737737
738+ #ifndef __APPLE__ /* Server side ALPN doesn't work for MacOS */
738739 ASSERT_FAILS (s_tester_wait (& tester , s_tester_connection_setup_pred ));
739740 /* Assert that we have the negotiated protocol and error returned from callback */
740741 ASSERT_TRUE (aws_byte_buf_eq_c_str (& tester .negotiated_protocol , customized_alpn_string ));
741742 ASSERT_INT_EQUALS (aws_last_error (), AWS_ERROR_HTTP_UNSUPPORTED_PROTOCOL );
742-
743+ #else
744+ ASSERT_SUCCESS (s_tester_wait (& tester , s_tester_connection_setup_pred ));
745+ #endif
743746 /* clean up */
744747 release_all_client_connections (& tester );
745748 release_all_server_connections (& tester );
Original file line number Diff line number Diff line change @@ -344,15 +344,8 @@ AWS_TEST_CASE(
344344/*
345345 * For tls-enabled tunneling proxy connections:
346346 * Test the happy path by verifying CONNECT request, tls upgrade attempt
347- * TODO: This test is temporarily disabled on Apple platforms following a breaking change
348- * due to migration to the new Apple Network Framework. Investigations underway for rethinking
349- * proxy implementation on Apple platforms. Test should be re-enabled post-fix.
350347 */
351348static int s_test_https_tunnel_proxy_connection_success (struct aws_allocator * allocator , void * ctx ) {
352- #if defined(AWS_OS_APPLE )
353- (void )allocator ;
354- return AWS_OP_SKIP ;
355- #endif
356349 (void )ctx ;
357350
358351 struct mocked_proxy_test_options options = {
You can’t perform that action at this time.
0 commit comments