renamed socket tests

12 files changed, 12 insertions, 12 deletions

diff --git a/tests/runner.py b/tests/runner.py
index 2bd26eb7..dbf7cb4f 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -13951,7 +13951,7 @@ Press any key to continue.'''
     def test_sockets(self):
       try:
         with self.WebsockHarness(8990):
-          self.btest('websockets.c', expected='571', args=['-DSOCKK=8991'])
+          self.btest('sockets/test_sockets.c', expected='571', args=['-DSOCKK=8991'])
       finally:
         self.clean_pids()
 
@@ -13978,7 +13978,7 @@ Press any key to continue.'''
 
       try:
         with self.WebsockHarness(8990, partial):
-          self.btest('websockets_partial.c', expected='165', args=['-DSOCKK=8991'])
+          self.btest('sockets/test_sockets_partial.c', expected='165', args=['-DSOCKK=8991'])
       finally:
         self.clean_pids()
 
@@ -13997,15 +13997,15 @@ Press any key to continue.'''
             print >> sys.stderr, 'test_websocket_bi datagram %d, fileops %d' % (datagram, fileops)
             with self.WebsockHarness(6992, self.make_relay_server(6992, 6994)):
               with self.WebsockHarness(6994, no_server=True):
-                Popen([PYTHON, EMCC, path_from_root('tests', 'websockets_bi_side.c'), '-o', 'side.html', '-DSOCKK=6995', '-DTEST_DGRAM=%d' % datagram]).communicate()
-                self.btest('websockets_bi.c', expected='2499', args=['-DSOCKK=6993', '-DTEST_DGRAM=%d' % datagram, '-DTEST_FILE_OPS=%s' % fileops, '-DEMBED_SIDE'])
+                Popen([PYTHON, EMCC, path_from_root('tests', 'sockets/test_sockets_bi_side.c'), '-o', 'side.html', '-DSOCKK=6995', '-DTEST_DGRAM=%d' % datagram]).communicate()
+                self.btest('sockets/test_sockets_bi.c', expected='2499', args=['-DSOCKK=6993', '-DTEST_DGRAM=%d' % datagram, '-DTEST_FILE_OPS=%s' % fileops, '-DEMBED_SIDE'])
           finally:
             self.clean_pids()
 
     def test_sockets_gethostbyname(self):
       try:
         with self.WebsockHarness(7000):
-          self.btest('websockets_gethostbyname.c', expected='571', args=['-O2', '-DSOCKK=7001'])
+          self.btest('sockets/test_sockets_gethostbyname.c', expected='571', args=['-O2', '-DSOCKK=7001'])
       finally:
         self.clean_pids()
 
@@ -14013,8 +14013,8 @@ Press any key to continue.'''
       try:
         with self.WebsockHarness(3992, self.make_relay_server(3992, 3994)):
           with self.WebsockHarness(3994, no_server=True):
-            Popen([PYTHON, EMCC, path_from_root('tests', 'websockets_bi_side_bigdata.c'), '-o', 'side.html', '-DSOCKK=3995', '-s', 'SOCKET_DEBUG=0', '-I' + path_from_root('tests')]).communicate()
-            self.btest('websockets_bi_bigdata.c', expected='0', args=['-DSOCKK=3993', '-s', 'SOCKET_DEBUG=0', '-I' + path_from_root('tests')])
+            Popen([PYTHON, EMCC, path_from_root('tests', 'sockets/test_sockets_bi_side_bigdata.c'), '-o', 'side.html', '-DSOCKK=3995', '-s', 'SOCKET_DEBUG=0', '-I' + path_from_root('tests/sockets')]).communicate()
+            self.btest('sockets/test_sockets_bi_bigdata.c', expected='0', args=['-DSOCKK=3993', '-s', 'SOCKET_DEBUG=0', '-I' + path_from_root('tests/sockets')])
       finally:
         self.clean_pids()
 
@@ -14027,7 +14027,7 @@ Press any key to continue.'''
         ssock.bind(("127.0.0.1", 8994))
       try:
         with self.WebsockHarness(8994, closedServer):
-          self.btest('websockets_select.c', expected='266', args=['-DSOCKK=8995'])
+          self.btest('sockets/test_sockets_select.c', expected='266', args=['-DSOCKK=8995'])
       finally:
         self.clean_pids()
 
@@ -14047,7 +14047,7 @@ Press any key to continue.'''
 
       try:
         with self.WebsockHarness(8994, closingServer):
-          self.btest('websockets_select_server_closes_connection.c', expected='266', args=['-DSOCKK=8995'])
+          self.btest('sockets/test_sockets_select_server_closes_connection.c', expected='266', args=['-DSOCKK=8995'])
       finally:
         self.clean_pids()
 
@@ -14079,7 +14079,7 @@ Press any key to continue.'''
 
       try:
         with self.WebsockHarness(8998, closingServer_rw):
-          self.btest('websockets_select_server_closes_connection_rw.c', expected='266', args=['-DSOCKK=8999'])
+          self.btest('sockets/test_sockets_select_server_closes_connection_rw.c', expected='266', args=['-DSOCKK=8999'])
       finally:
         self.clean_pids()
 
diff --git a/tests/websockets.c b/tests/sockets/test_sockets.c
index 8845ef43..8845ef43 100644
--- a/tests/websockets.c
+++ b/tests/sockets/test_sockets.c
diff --git a/tests/websockets_bi.c b/tests/sockets/test_sockets_bi.c
index e19f7fe8..e19f7fe8 100644
--- a/tests/websockets_bi.c
+++ b/tests/sockets/test_sockets_bi.c
diff --git a/tests/websockets_bi_bigdata.c b/tests/sockets/test_sockets_bi_bigdata.c
index e3509649..c1d8100e 100644
--- a/tests/websockets_bi_bigdata.c
+++ b/tests/sockets/test_sockets_bi_bigdata.c
@@ -13,7 +13,7 @@
 #include <emscripten.h>
 #endif
 
-#include "websockets_bigdata.h"
+#include "test_sockets_bigdata.h"
 
 #define EXPECTED_BYTES DATA_SIZE
 
diff --git a/tests/websockets_bi_side.c b/tests/sockets/test_sockets_bi_side.c
index b8910632..b8910632 100644
--- a/tests/websockets_bi_side.c
+++ b/tests/sockets/test_sockets_bi_side.c
diff --git a/tests/websockets_bi_side_bigdata.c b/tests/sockets/test_sockets_bi_side_bigdata.c
index d131e6e0..e31029b6 100644
--- a/tests/websockets_bi_side_bigdata.c
+++ b/tests/sockets/test_sockets_bi_side_bigdata.c
@@ -13,7 +13,7 @@
 #include <emscripten.h>
 #endif
 
-#include "websockets_bigdata.h"
+#include "test_sockets_bigdata.h"
 
 #define EXPECTED_BYTES 5
 
diff --git a/tests/websockets_bigdata.h b/tests/sockets/test_sockets_bigdata.h
index 17149ad6..17149ad6 100644
--- a/tests/websockets_bigdata.h
+++ b/tests/sockets/test_sockets_bigdata.h
diff --git a/tests/websockets_gethostbyname.c b/tests/sockets/test_sockets_gethostbyname.c
index 59c55ba1..59c55ba1 100644
--- a/tests/websockets_gethostbyname.c
+++ b/tests/sockets/test_sockets_gethostbyname.c
diff --git a/tests/websockets_partial.c b/tests/sockets/test_sockets_partial.c
index 5fe34721..5fe34721 100644
--- a/tests/websockets_partial.c
+++ b/tests/sockets/test_sockets_partial.c
diff --git a/tests/websockets_select.c b/tests/sockets/test_sockets_select.c
index e05bd4c8..e05bd4c8 100644
--- a/tests/websockets_select.c
+++ b/tests/sockets/test_sockets_select.c
diff --git a/tests/websockets_select_server_closes_connection.c b/tests/sockets/test_sockets_select_server_closes_connection.c
index 4181b12b..4181b12b 100644
--- a/tests/websockets_select_server_closes_connection.c
+++ b/tests/sockets/test_sockets_select_server_closes_connection.c
diff --git a/tests/websockets_select_server_closes_connection_rw.c b/tests/sockets/test_sockets_select_server_closes_connection_rw.c
index f7e19aca..f7e19aca 100644
--- a/tests/websockets_select_server_closes_connection_rw.c
+++ b/tests/sockets/test_sockets_select_server_closes_connection_rw.c