tests-local-network-only-2

Author: lws-team

lib/plat/unix/unix-spawn.c

@@ -74,6 +74,15 @@ lws_spawn_sul_reap(struct lws_sorted_usec_list *sul)
 				 __func__, lsp);
 			lsp->reap_retry_budget = 20;
 			lws_spawn_piped_kill_child_process(lsp);
+			/*
+			 * If the stdwsi are already gone (why we are here),
+			 * there will be no more pipe close events to call
+			 * lws_spawn_reap()... keep retrying until the killed
+			 * child is actually reapable.
+			 */
+			lws_sul_schedule(lsp->info.vh->context, lsp->info.tsi,
+					 &lsp->sul_reap, lws_spawn_sul_reap,
+					 250 * LWS_US_PER_MS);
 		}
 	}
 }

minimal-examples-lowlevel/http-server/minimal-http-server-httpbin/minimal-http-server-httpbin.c

@@ -291,6 +291,7 @@ int main(int argc, const char **argv)
 	info.mounts = &mount_dyn;
 	info.vhost_name = "http";
 
+#if defined(LWS_WITH_TLS)
 	/*
 	 * This is a test peer for h1 / h2 ctests.  Without an explicit alpn,
 	 * an h3-capable lws gives the vhost the context default alpn list
@@ -301,6 +302,7 @@ int main(int argc, const char **argv)
 	 * this peer to h2 and h1.
 	 */
 	info.alpn = "h2,http/1.1";
+#endif
 
 	if (!lws_create_vhost(context, &info)) {
 		lwsl_err("Failed to create vhost\n");

minimal-examples-lowlevel/secure-streams/minimal-secure-streams-blob/CMakeLists.txt

@@ -47,6 +47,12 @@ if (requirements)
 				ENVIRONMENT "SAI_LIST_PORT=${PORT_BLOB_HBIN_TLS}")
 		set_tests_properties(ki_blob_hbin PROPERTIES FIXTURES_CLEANUP blob_hbin)
 
+		add_test(NAME ssblob-warmcat-local COMMAND lws-minimal-secure-streams-blob
+			 -c ${CMAKE_CURRENT_BINARY_DIR}/policy-local.json)
+		set_tests_properties(ssblob-warmcat-local PROPERTIES
+			 FIXTURES_REQUIRED "blob_hbin"
+			 TIMEOUT 40)
+
 					endif()
 
 	if (websockets_shared)
@@ -113,6 +119,13 @@ if (requirements)
 			-c ${CMAKE_CURRENT_BINARY_DIR}/policy-local.json)
 		set_tests_properties(ki_blob_proxy_local PROPERTIES FIXTURES_CLEANUP blob_proxy_local)
 
+		add_test(NAME sspcblob-minimal-local COMMAND lws-minimal-secure-streams-blob-client
+			 -i +${CTEST_LOCAL_SOCKET_PATH} --timeout_ms 65000)
+		set_tests_properties(sspcblob-minimal-local PROPERTIES
+			 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/minimal-examples-lowlevel/secure-streams/minimal-secure-streams-blob
+			 FIXTURES_REQUIRED "blob_proxy_local;blob_hbin"
+			 TIMEOUT 70)
+
 					endif()
 
 endif()

minimal-examples-lowlevel/secure-streams/minimal-secure-streams-client-tx/CMakeLists.txt

@@ -32,9 +32,11 @@ if (requirements)
 	#
 	# Local-server variant: runs a local lws-minimal-http-server-httpbin over
 	# TLS, and the proxy with a local policy, so it does not need any external
-	# gate.
+	# network egress.
 	#
 
+	if (NOT WIN32 AND LWS_WITH_SERVER)
+
 	lws_get_free_port(PORT_TX_HBIN_TLS)
 
 		add_test(NAME st_tx_hbin
@@ -52,6 +54,8 @@ if (requirements)
 				ENVIRONMENT "SAI_LIST_PORT=${PORT_TX_HBIN_TLS}")
 		set_tests_properties(ki_tx_hbin PROPERTIES FIXTURES_CLEANUP tx_hbin)
 
+	endif()
+
 
 	#
 	# Local-proxy variant: the proxy uses the local policy and the local
@@ -95,6 +99,13 @@ if (requirements)
 			-c ${CMAKE_CURRENT_BINARY_DIR}/policy-local.json)
 		set_tests_properties(ki_tx_proxy_local PROPERTIES FIXTURES_CLEANUP tx_proxy_local)
 
-					endif()
+		add_test(NAME sspc-minimaltx-local COMMAND lws-minimal-secure-streams-client-tx
+			 -i +${CTEST_LOCAL_SOCKET_PATH})
+		set_tests_properties(sspc-minimaltx-local PROPERTIES
+			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/minimal-examples-lowlevel/secure-streams/minimal-secure-streams-client-tx
+			FIXTURES_REQUIRED "tx_proxy_local;tx_hbin"
+			TIMEOUT 40)
+
+	endif()
 
 endif()

minimal-examples-lowlevel/secure-streams/minimal-secure-streams-hugeurl/CMakeLists.txt

@@ -69,6 +69,18 @@ if (requirements)
 				ENVIRONMENT "SAI_LIST_PORT=${PORT_HURL_HBIN_TLS}")
 		set_tests_properties(ki_hurl_hbin PROPERTIES FIXTURES_CLEANUP hurl_hbin)
 
+		add_test(NAME ss-warmcat-hurl-local COMMAND lws-minimal-secure-streams-hugeurl
+			 -c ${CMAKE_CURRENT_BINARY_DIR}/policy-local.json -h 1024 --h1)
+		set_tests_properties(ss-warmcat-hurl-local PROPERTIES
+			 FIXTURES_REQUIRED "hurl_hbin"
+			 TIMEOUT 40)
+
+		add_test(NAME ss-warmcat-hurl-local-h2 COMMAND lws-minimal-secure-streams-hugeurl
+			 -c ${CMAKE_CURRENT_BINARY_DIR}/policy-local.json -h 1024)
+		set_tests_properties(ss-warmcat-hurl-local-h2 PROPERTIES
+			 FIXTURES_REQUIRED "hurl_hbin"
+			 TIMEOUT 40)
+
 									endif()
 
 
@@ -114,6 +126,13 @@ if (requirements)
 			-c ${CMAKE_CURRENT_BINARY_DIR}/policy-local.json)
 		set_tests_properties(ki_hurl_proxy_local PROPERTIES FIXTURES_CLEANUP hurl_proxy_local)
 
+		add_test(NAME sspc-minimal-hurl-local COMMAND lws-minimal-secure-streams-hugeurl-client
+			 -i +${CTEST_LOCAL_SOCKET_PATH})
+		set_tests_properties(sspc-minimal-hurl-local PROPERTIES
+			 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/minimal-examples-lowlevel/secure-streams/minimal-secure-streams-hugeurl
+			 FIXTURES_REQUIRED "hurl_proxy_local;hurl_hbin"
+			 TIMEOUT 40)
+
 					endif()
 
 endif()

minimal-examples-lowlevel/secure-streams/minimal-secure-streams-perf/CMakeLists.txt

@@ -68,6 +68,12 @@ if (requirements)
 				ENVIRONMENT "SAI_LIST_PORT=${PORT_PERF_HBIN_TLS}")
 		set_tests_properties(ki_perf_hbin PROPERTIES FIXTURES_CLEANUP perf_hbin)
 
+		add_test(NAME ssperf-warmcat-local COMMAND lws-minimal-secure-streams-perf
+			 -c ${CMAKE_CURRENT_BINARY_DIR}/policy-local.json)
+		set_tests_properties(ssperf-warmcat-local PROPERTIES
+			 FIXTURES_REQUIRED "perf_hbin"
+			 TIMEOUT 40)
+
 					endif()
 
 
@@ -113,6 +119,13 @@ if (requirements)
 			-c ${CMAKE_CURRENT_BINARY_DIR}/policy-local.json)
 		set_tests_properties(ki_perf_proxy_local PROPERTIES FIXTURES_CLEANUP perf_proxy_local)
 
+		add_test(NAME ssperfpc-minimal-local COMMAND lws-minimal-secure-streams-perf-client
+			 -i +${CTEST_LOCAL_SOCKET_PATH})
+		set_tests_properties(ssperfpc-minimal-local PROPERTIES
+			 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/minimal-examples-lowlevel/secure-streams/minimal-secure-streams-perf
+			 FIXTURES_REQUIRED "perf_proxy_local;perf_hbin"
+			 TIMEOUT 40)
+
 					endif()
 
 endif()

minimal-examples-lowlevel/secure-streams/minimal-secure-streams-smd/CMakeLists.txt

@@ -135,6 +135,12 @@ if (requirements)
 				ENVIRONMENT "SAI_LIST_PORT=${PORT_SMD_HBIN_TLS}")
 		set_tests_properties(ki_smd_hbin PROPERTIES FIXTURES_CLEANUP smd_hbin)
 
+		add_test(NAME ss-smd-local COMMAND lws-minimal-secure-streams-smd
+			 -c ${CMAKE_CURRENT_BINARY_DIR}/policy-local.json)
+		set_tests_properties(ss-smd-local PROPERTIES
+			 FIXTURES_REQUIRED "smd_hbin"
+			 TIMEOUT 80)
+
 					endif()
 
 

minimal-examples-lowlevel/secure-streams/minimal-secure-streams-threads/CMakeLists.txt

@@ -123,6 +123,12 @@ if (requirements AND NOT WIN32)
 				ENVIRONMENT "SAI_LIST_PORT=${PORT_THR_HBIN_TLS}")
 		set_tests_properties(ki_thr_hbin PROPERTIES FIXTURES_CLEANUP thr_hbin)
 
+		add_test(NAME ss-threads-local COMMAND lws-minimal-secure-streams-threads
+			 -c ${CMAKE_CURRENT_BINARY_DIR}/policy-local.json)
+		set_tests_properties(ss-threads-local PROPERTIES
+			 FIXTURES_REQUIRED "thr_hbin"
+			 TIMEOUT 40)
+
 					endif()
 
 

minimal-examples-lowlevel/secure-streams/minimal-secure-streams/CMakeLists.txt

@@ -111,6 +111,12 @@ if (requirements)
 				ENVIRONMENT "SAI_LIST_PORT=${PORT_MS_HBIN_TLS}")
 		set_tests_properties(ki_ms_hbin PROPERTIES FIXTURES_CLEANUP ms_hbin)
 
+		add_test(NAME ss-warmcat-local COMMAND lws-minimal-secure-streams
+			 -c ${CMAKE_CURRENT_BINARY_DIR}/policy-local.json)
+		set_tests_properties(ss-warmcat-local PROPERTIES
+			 FIXTURES_REQUIRED "ms_hbin"
+			 TIMEOUT 40)
+
 					endif()
 
 	if (websockets_shared)
@@ -177,6 +183,13 @@ if (requirements)
 			-c ${CMAKE_CURRENT_BINARY_DIR}/policy-local.json)
 		set_tests_properties(ki_ms_proxy_local PROPERTIES FIXTURES_CLEANUP ms_proxy_local)
 
+		add_test(NAME sspc-minimal-local COMMAND lws-minimal-secure-streams-client
+			 -i +${CTEST_LOCAL_SOCKET_PATH})
+		set_tests_properties(sspc-minimal-local PROPERTIES
+			 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/minimal-examples-lowlevel/secure-streams/minimal-secure-streams
+			 FIXTURES_REQUIRED "ms_proxy_local;ms_hbin"
+			 TIMEOUT 40)
+
 					endif()
 
 endif()

minimal-examples/client/hello_world/CMakeLists.txt

@@ -173,9 +173,8 @@ if (requirements)
 		set_tests_properties(ki_hw_proxy_local PROPERTIES FIXTURES_CLEANUP hw_proxy_local)
 
 		add_test(NAME msspc-hello_world-local COMMAND lws-minimal-ss-hello_world-client
-			--ssproxy-iface +${CTEST_LOCAL_SOCKET_PATH}
 			--url https://${LWS_CTEST_SERVER_URL_RESOLVE}:${PORT_HW_HBIN_TLS}/httpbin/bytes/2000
-			 -i ${CTEST_LOCAL_SOCKET_PATH})
+			--ssproxy-iface +${CTEST_LOCAL_SOCKET_PATH})
 		set_tests_properties(msspc-hello_world-local PROPERTIES
 			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/minimal-examples/client/hello_world
 			FIXTURES_REQUIRED "hw_proxy_local;hw2_hbin"