File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -652,9 +652,7 @@ add_test_case(test_no_proxy_invalid_patterns)
652652add_test_case (test_no_proxy_invalid_host_inputs )
653653
654654add_test_case (http_tunnel_proxy_connection_success )
655- if (NOT APPLE )
656655add_test_case (https_tunnel_proxy_connection_success )
657- endif ()
658656add_test_case (http_tunnel_proxy_connection_failure_connect )
659657add_test_case (https_tunnel_proxy_connection_failure_connect )
660658add_test_case (https_tunnel_proxy_connection_failure_tls )
Original file line number Diff line number Diff line change @@ -735,18 +735,11 @@ 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- // TODO: Investigate further and fix behavior taking into account the recent migration
739- // to newer Apple Netowrk Frameowrk on aws-c-io. Implemented temporary fix for CI tests.
740- // CI fails on local for some machines. Still under investigation.
741-
742- // #ifndef __APPLE__ /* Server side ALPN doesn't work for MacOS */
743738 ASSERT_FAILS (s_tester_wait (& tester , s_tester_connection_setup_pred ));
744739 /* Assert that we have the negotiated protocol and error returned from callback */
745740 ASSERT_TRUE (aws_byte_buf_eq_c_str (& tester .negotiated_protocol , customized_alpn_string ));
746741 ASSERT_INT_EQUALS (aws_last_error (), AWS_ERROR_HTTP_UNSUPPORTED_PROTOCOL );
747- // #else
748- // ASSERT_SUCCESS(s_tester_wait(&tester, s_tester_connection_setup_pred));
749- // #endif
742+
750743 /* clean up */
751744 release_all_client_connections (& tester );
752745 release_all_server_connections (& tester );
Original file line number Diff line number Diff line change @@ -346,9 +346,13 @@ AWS_TEST_CASE(
346346 * Test the happy path by verifying CONNECT request, tls upgrade attempt
347347 * TODO: This test is temporarily disabled on Apple platforms following a breaking change
348348 * 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 on CMakeLists.txt .
349+ * proxy implementation on Apple platforms. Test should be re-enabled post-fix.
350350 */
351351static 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
352356 (void )ctx ;
353357
354358 struct mocked_proxy_test_options options = {
You can’t perform that action at this time.
0 commit comments