Use btest_exit in tests/test_sockets.py. NFC (#16444)

Author: sbc100

tests/sdl2_net_client.c

@@ -46,11 +46,9 @@ void finish(int result) {
     SDLNet_Quit();
   }
 #ifdef __EMSCRIPTEN__
-  REPORT_RESULT(result);
-  emscripten_force_exit(result);
-#else
-  exit(result);
+  emscripten_cancel_main_loop();
 #endif
+  exit(result);
 }
 
 char *msgs[] = {

tests/sockets/test_enet_client.c

@@ -5,6 +5,7 @@
  * found in the LICENSE file.
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <enet/enet.h>
@@ -40,12 +41,8 @@ void main_loop() {
               (char*)event.peer -> data,
               event.channelID);
 
-      int result = strcmp("packetfoo", (char*)event.packet->data);
-#ifdef __EMSCRIPTEN__
-      REPORT_RESULT(result);
-#else
+      assert(strcmp("packetfoo", (char*)event.packet->data) == 0);
       exit(EXIT_SUCCESS);
-#endif
 
       /* Clean up the packet now that we're done using it. */
       enet_packet_destroy (event.packet);

tests/sockets/test_sockets_echo_client.c

@@ -45,18 +45,19 @@ int echo_read;
 int echo_wrote;
 
 void finish(int result) {
+  printf("finish: %d\n", result);
   if (server.fd) {
     close(server.fd);
     server.fd = 0;
   }
 #ifdef __EMSCRIPTEN__
-#ifdef REPORT_RESULT
-  REPORT_RESULT(result);
-#endif
+#if TEST_ASYNC
   emscripten_force_exit(result);
 #else
-  exit(result);
+  emscripten_cancel_main_loop();
 #endif
+#endif
+  exit(result);
 }
 
 void main_loop() {

tests/sockets/test_sockets_select_server_closes_connection_client_rw.c

@@ -32,11 +32,9 @@ msg_t writemsg;
 void finish(int result) {
   close(sockfd);
 #ifdef __EMSCRIPTEN__
-  REPORT_RESULT(result);
-  emscripten_force_exit(result);
-#else
-  exit(result);
+  emscripten_cancel_main_loop();
 #endif
+  exit(result);
 }
 
 void main_loop() {
@@ -45,12 +43,12 @@ void main_loop() {
   static int writePos = 0;
   int selectRes;
   ssize_t transferAmount;
-  fd_set sett;  
-  
+  fd_set sett;
+
   switch (state) {
     case 0:
       // writing 10 bytes to the server
-      
+
       // since the socket in the read file descriptors has no available data,
       // select should tell us 0 handles are ready
       FD_ZERO(&sett);
@@ -60,7 +58,7 @@ void main_loop() {
         printf("case 0: read select != 0 (%d)\n", selectRes);
         finish(EXIT_FAILURE);
       }
-      
+
       // the socket in the write file descriptors has to result in either a 0 or 1
       // the connection either is setting up or is established and writing is possible
       FD_ZERO(&sett);
@@ -72,17 +70,17 @@ void main_loop() {
       } else if (selectRes == 0) {
         return;
       }
-      
+
       // send a single byte
       transferAmount = do_msg_write(sockfd, &writemsg, writePos, 1, NULL, 0);
       if (transferAmount != -1) writePos += transferAmount;
-   
+
       // after 10 bytes switch to next state
       if (writePos >= writemsg.length) {
         state = 1;
       }
       break;
-      
+
     case 1:
       // wait until we can read one byte to make sure the server
       // has sent the data and then closed the connection
@@ -104,13 +102,13 @@ void main_loop() {
       } else if (transferAmount != -1) {
         readPos += transferAmount;
       }
-   
+
       // if successfully reading 1 byte, switch to next state
       if (readPos >= 1) {
         state = 2;
       }
       break;
-    
+
     case 2:
       // calling select with the socket in the write file descriptors should
       // succeed, but the socket should not set in the set.
@@ -122,7 +120,7 @@ void main_loop() {
         finish(EXIT_FAILURE);
       }
 
-      // calling select with the socket in the read file descriptors 
+      // calling select with the socket in the read file descriptors
       // has to succeed because there is still data in the inQueue
       FD_ZERO(&sett);
       FD_SET(sockfd, &sett);
@@ -133,7 +131,7 @@ void main_loop() {
       } else if (selectRes == 0) {
         return;
       }
-      
+
       // read a single byte
       transferAmount = do_msg_read(sockfd, &readmsg, readPos, 1, NULL, NULL);
       if (transferAmount == 0) {
@@ -142,15 +140,15 @@ void main_loop() {
       } else if (transferAmount != -1) {
         readPos += transferAmount;
       }
-      
+
       // with 10 bytes read the inQueue is empty => switch state
       if (readPos >= readmsg.length) {
         state = 3;
       }
       break;
-      
+
     case 3:
-      // calling select with the socket in the read file descriptors 
+      // calling select with the socket in the read file descriptors
       // should succeed
       FD_ZERO(&sett);
       FD_SET(sockfd, &sett);
@@ -167,30 +165,30 @@ void main_loop() {
         printf("case 3: read != 0\n");
         finish(EXIT_FAILURE);
       }
-      
-      // report back success, the 266 is just an arbitrary value without 
+
+      // report back success, the 266 is just an arbitrary value without
       // deeper meaning
-      finish(266);
+      finish(0);
       break;
-      
+
     default:
       printf("Impossible state!\n");
       finish(EXIT_FAILURE);
       break;
   }
-  
+
   return;
 }
 
 // This test checks for an intended asymmetry in the behavior of the select function.
-// Scenario: the client sends data to the server. After 10 received bytes the 
+// Scenario: the client sends data to the server. After 10 received bytes the
 // server sends 10 bytes on its own and immediately afterwards closes the connection.
 // This mimics a typical connect-request-response-disconnect situation.
-// After the server closed the connection select calls with the socket in the write file 
-// descriptors have to fail as the tcp connection is already down and there is no way 
-// anymore to send data. 
-// Select calls with the socket in the read file descriptor list still have to succeed 
-// as there are still 10 bytes to read from the inQueue. So, for the same socket the 
+// After the server closed the connection select calls with the socket in the write file
+// descriptors have to fail as the tcp connection is already down and there is no way
+// anymore to send data.
+// Select calls with the socket in the read file descriptor list still have to succeed
+// as there are still 10 bytes to read from the inQueue. So, for the same socket the
 // select call behaves differently depending on whether the socket is listed in the
 // read or write file descriptors.
 int main() {

tests/sockets/test_sockets_select_server_down_client.c

@@ -28,11 +28,9 @@ int sockfd = -1;
 void finish(int result) {
   close(sockfd);
 #ifdef __EMSCRIPTEN__
-  REPORT_RESULT(result);
-  emscripten_force_exit(result);
-#else
-  exit(result);
+  emscripten_cancel_main_loop();
 #endif
+  exit(result);
 }
 
 void iter() {
@@ -61,7 +59,7 @@ void iter() {
       finish(EXIT_FAILURE);
     } else if (!n) {
       perror("Connection to websocket server failed as expected.");
-      finish(266);
+      finish(0);
     }
   }
 }

tests/test_sockets.py

@@ -189,15 +189,15 @@ def test_sockets_echo(self, extra_args=[]):
 
     for harness, datagram in harnesses:
       with harness:
-        self.btest(test_file('sockets/test_sockets_echo_client.c'), expected='0', args=['-DSOCKK=%d' % harness.listen_port, '-DTEST_DGRAM=%d' % datagram, sockets_include])
+        self.btest_exit(test_file('sockets/test_sockets_echo_client.c'), args=['-DSOCKK=%d' % harness.listen_port, '-DTEST_DGRAM=%d' % datagram, sockets_include])
 
   def test_sockets_echo_pthreads(self, extra_args=[]):
     self.test_sockets_echo(['-sUSE_PTHREADS', '-sPROXY_TO_PTHREAD'])
 
   def test_sdl2_sockets_echo(self):
     harness = CompiledServerHarness('sdl2_net_server.c', ['-sUSE_SDL=2', '-sUSE_SDL_NET=2'], 49164)
     with harness:
-      self.btest('sdl2_net_client.c', expected='0', args=['-sUSE_SDL=2', '-sUSE_SDL_NET=2', '-DSOCKK=%d' % harness.listen_port])
+      self.btest_exit('sdl2_net_client.c', args=['-sUSE_SDL=2', '-sUSE_SDL_NET=2', '-DSOCKK=%d' % harness.listen_port])
 
   def test_sockets_async_echo(self):
     sockets_include = '-I' + test_file('sockets')
@@ -216,11 +216,12 @@ def test_sockets_async_echo(self):
     for harness, datagram in harnesses:
       print('harness:', harness)
       with harness:
-        self.btest(test_file('sockets/test_sockets_echo_client.c'), expected='0', args=['-DSOCKK=%d' % harness.listen_port, '-DTEST_DGRAM=%d' % datagram, '-DTEST_ASYNC=1', sockets_include])
+        self.btest_exit(test_file('sockets/test_sockets_echo_client.c'), args=['-DSOCKK=%d' % harness.listen_port, '-DTEST_DGRAM=%d' % datagram, '-DTEST_ASYNC=1', sockets_include])
+        return
 
     # Deliberately attempt a connection on a port that will fail to test the error callback and getsockopt
     print('expect fail')
-    self.btest(test_file('sockets/test_sockets_echo_client.c'), expected='0', args=['-DSOCKK=49169', '-DTEST_ASYNC=1', sockets_include])
+    self.btest_exit(test_file('sockets/test_sockets_echo_client.c'), args=['-DSOCKK=49169', '-DTEST_ASYNC=1', sockets_include])
 
   def test_sockets_echo_bigdata(self):
     sockets_include = '-I' + test_file('sockets')
@@ -231,9 +232,8 @@ def test_sockets_echo_bigdata(self):
       message += str(chr(ord('a') + (i % 26)))
 
     # re-write the client test with this literal (it's too big to pass via command line)
-    input_filename = test_file('sockets/test_sockets_echo_client.c')
-    input = read_file(input_filename)
-    create_file('test_sockets_echo_bigdata.c', input.replace('#define MESSAGE "pingtothepong"', '#define MESSAGE "%s"' % message))
+    src = read_file(test_file('sockets/test_sockets_echo_client.c'))
+    create_file('test_sockets_echo_bigdata.c', src.replace('#define MESSAGE "pingtothepong"', '#define MESSAGE "%s"' % message))
 
     harnesses = [
       (CompiledServerHarness(test_file('sockets/test_sockets_echo_server.c'), [sockets_include, '-DTEST_DGRAM=0'], 49172), 0),
@@ -245,7 +245,7 @@ def test_sockets_echo_bigdata(self):
 
     for harness, datagram in harnesses:
       with harness:
-        self.btest('test_sockets_echo_bigdata.c', expected='0', args=[sockets_include, '-DSOCKK=%d' % harness.listen_port, '-DTEST_DGRAM=%d' % datagram])
+        self.btest_exit('test_sockets_echo_bigdata.c', args=[sockets_include, '-DSOCKK=%d' % harness.listen_port, '-DTEST_DGRAM=%d' % datagram])
 
   @no_windows('This test is Unix-specific.')
   def test_sockets_partial(self):
@@ -263,7 +263,7 @@ def test_sockets_select_server_down(self):
       CompiledServerHarness(test_file('sockets/test_sockets_select_server_down_server.c'), [], 49191)
     ]:
       with harness:
-        self.btest(test_file('sockets/test_sockets_select_server_down_client.c'), expected='266', args=['-DSOCKK=%d' % harness.listen_port])
+        self.btest_exit(test_file('sockets/test_sockets_select_server_down_client.c'), args=['-DSOCKK=%d' % harness.listen_port])
 
   @no_windows('This test is Unix-specific.')
   def test_sockets_select_server_closes_connection_rw(self):
@@ -274,7 +274,7 @@ def test_sockets_select_server_closes_connection_rw(self):
       CompiledServerHarness(test_file('sockets/test_sockets_echo_server.c'), [sockets_include, '-DCLOSE_CLIENT_AFTER_ECHO'], 49201)
     ]:
       with harness:
-        self.btest(test_file('sockets/test_sockets_select_server_closes_connection_client_rw.c'), expected='266', args=[sockets_include, '-DSOCKK=%d' % harness.listen_port])
+        self.btest_exit(test_file('sockets/test_sockets_select_server_closes_connection_client_rw.c'), args=[sockets_include, '-DSOCKK=%d' % harness.listen_port])
 
   @no_windows('This test uses Unix-specific build architecture.')
   def test_enet(self):
@@ -290,7 +290,7 @@ def test_enet(self):
       CompiledServerHarness(test_file('sockets/test_enet_server.c'), enet, 49210)
     ]:
       with harness:
-        self.btest(test_file('sockets/test_enet_client.c'), expected='0', args=enet + ['-DSOCKK=%d' % harness.listen_port])
+        self.btest_exit(test_file('sockets/test_enet_client.c'), args=enet + ['-DSOCKK=%d' % harness.listen_port])
 
   def test_nodejs_sockets_echo(self):
     # This test checks that sockets work when the client code is run in Node.js
@@ -354,7 +354,7 @@ def test_nodejs_sockets_echo(self):
   # N.B. running this test requires 'npm install ws' in Emscripten root directory
   def test_websocket_send(self):
     with NodeJsWebSocketEchoServerProcess():
-      self.btest(test_file('websocket/test_websocket_send.c'), expected='101', args=['-lwebsocket', '-sNO_EXIT_RUNTIME', '-sWEBSOCKET_DEBUG'])
+      self.btest_exit(test_file('websocket/test_websocket_send.c'), args=['-lwebsocket', '-sNO_EXIT_RUNTIME', '-sWEBSOCKET_DEBUG'])
 
   # Test that native POSIX sockets API can be used by proxying calls to an intermediate WebSockets -> POSIX sockets bridge server
   def test_posix_proxy_sockets(self):
@@ -369,4 +369,4 @@ def test_posix_proxy_sockets(self):
     with BackgroundServerProcess([proxy_server, '8080']):
       with PythonTcpEchoServerProcess('7777'):
         # Build and run the TCP echo client program with Emscripten
-        self.btest(test_file('websocket/tcp_echo_client.cpp'), expected='101', args=['-lwebsocket', '-sPROXY_POSIX_SOCKETS', '-sUSE_PTHREADS', '-sPROXY_TO_PTHREAD'])
+        self.btest_exit(test_file('websocket/tcp_echo_client.cpp'), args=['-lwebsocket', '-sPROXY_POSIX_SOCKETS', '-sUSE_PTHREADS', '-sPROXY_TO_PTHREAD'])

tests/websocket/tcp_echo_client.cpp

@@ -79,7 +79,7 @@ int main(int argc , char *argv[])
   if (sock == -1)
   {
     printf("Could not create socket");
-    exit(1);
+    return 1;
   }
   printf("Socket created: %d\n", sock);
 
@@ -116,8 +116,5 @@ int main(int argc , char *argv[])
   }
 
   close(sock);
-#ifdef REPORT_RESULT
-  REPORT_RESULT(101);
-#endif
   return 0;
 }

tests/websocket/test_websocket_send.c

@@ -35,30 +35,21 @@ EM_BOOL WebSocketMessage(int eventType, const EmscriptenWebSocketMessageEvent *e
 	if (e->isText)
 	{
 		printf("text data: \"%s\"\n", e->data);
-#ifdef REPORT_RESULT
-		if (!!strcmp((const char*)e->data, "hello on the other side")) REPORT_RESULT(-1);
-		passed += 1;
-#endif
+		assert(strcmp((const char*)e->data, "hello on the other side") == 0);
 	}
 	else
 	{
 		printf("binary data:");
 		for(int i = 0; i < e->numBytes; ++i)
 		{
 			printf(" %02X", e->data[i]);
-#ifdef REPORT_RESULT
-			if (e->data[i] != i) REPORT_RESULT(-2);
-#endif
+			assert(e->data[i] == i);
 		}
 		printf("\n");
-		passed += 100;
 
 		emscripten_websocket_close(e->socket, 0, 0);
 		emscripten_websocket_delete(e->socket);
-#ifdef REPORT_RESULT
-		printf("%d\n", passed);
-		REPORT_RESULT(passed);
-#endif
+		emscripten_force_exit(0);
 	}
 	return 0;
 }
@@ -123,4 +114,6 @@ int main()
 	emscripten_websocket_set_onclose_callback(socket, (void*)43, WebSocketClose);
 	emscripten_websocket_set_onerror_callback(socket, (void*)44, WebSocketError);
 	emscripten_websocket_set_onmessage_callback(socket, (void*)45, WebSocketMessage);
+	emscripten_exit_with_live_runtime();
+	return 0;
 }