Reorg unix_socket tests files

Orange-OpenSource · Oct 2, 2024 · b1056d3 · b1056d3
1 parent 99f14cc
commit b1056d3
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 22 deletions.
diff --git a/bin/test/test_prerequisites.sh b/bin/test/test_prerequisites.sh
@@ -89,9 +89,9 @@ echo -e "\n------------------ Starting ssl/ssl_server.py (Self-signed certificat
 python3 tests_ssl/ssl_server.py 8003 tests_ssl/server/cert.selfsigned.pem true > build/server-ssl-client-authent.log 2>&1 &
 check_listen_port "tests_ssl/ssl_server.py" 8003 || cat_and_exit_err build/server-ssl-client-authent.log
 
-echo -e "\n------------------ Starting unix_socket/server.py"
-python3 tests_unix_socket/server.py > build/server-unix-socket.log 2>&1 &
-check_unix_socket "tests_unix_socket/server.py" build/unix_socket.sock "GET /hello HTTP/1.0\r\n"
+echo -e "\n------------------ Starting tests_unix_socket/unix_socket_server.py"
+python3 tests_unix_socket/unix_socket_server.py > build/server-unix-socket.log 2>&1 &
+check_unix_socket "tests_unix_socket/unix_socket_server.py" build/unix_socket.sock "GET /hello HTTP/1.0\r\n"
 
 echo -e "\n------------------ Starting squid (proxy)"
 if [ -f /var/run/squid.pid ] ; then

diff --git a/integration/hurl/tests_failed/unix_socket.sh b/integration/hurl/tests_failed/unix_socket.sh
diff --git a/integration/hurl/tests_ok/unix_socket.ps1 b/integration/hurl/tests_ok/unix_socket.ps1
diff --git a/integration/hurl/tests_ok/unix_socket.sh b/integration/hurl/tests_ok/unix_socket.sh
diff --git a/integration/hurl/tests_ok/unix_socket.curl → ...n/hurl/tests_unix_socket/unix_socket.curl b/integration/hurl/tests_ok/unix_socket.curl → ...n/hurl/tests_unix_socket/unix_socket.curl
diff --git a/...hurl/tests_failed/unix_socket.err.pattern → ...tests_unix_socket/unix_socket.err.pattern b/...hurl/tests_failed/unix_socket.err.pattern → ...tests_unix_socket/unix_socket.err.pattern
@@ -1,5 +1,5 @@
 error: HTTP connection
-  --> tests_ok/unix_socket.hurl:1:5
+  --> tests_unix_socket/unix_socket.hurl:1:5
    |
  1 | GET http://example/hello
    |     ^^^^^^^^^^^^^^^^^^^^ (7) <<<.*?>>>

diff --git a/...ration/hurl/tests_failed/unix_socket.exit → ...n/hurl/tests_unix_socket/unix_socket.exit b/...ration/hurl/tests_failed/unix_socket.exit → ...n/hurl/tests_unix_socket/unix_socket.exit
diff --git a/integration/hurl/tests_ok/unix_socket.hurl → ...n/hurl/tests_unix_socket/unix_socket.hurl b/integration/hurl/tests_ok/unix_socket.hurl → ...n/hurl/tests_unix_socket/unix_socket.hurl
diff --git a/integration/hurl/tests_ok/unix_socket.out → ...on/hurl/tests_unix_socket/unix_socket.out b/integration/hurl/tests_ok/unix_socket.out → ...on/hurl/tests_unix_socket/unix_socket.out
diff --git a/...gration/hurl/tests_failed/unix_socket.ps1 → ...on/hurl/tests_unix_socket/unix_socket.ps1 b/...gration/hurl/tests_failed/unix_socket.ps1 → ...on/hurl/tests_unix_socket/unix_socket.ps1
@@ -2,9 +2,9 @@ Set-StrictMode -Version latest
 $ErrorActionPreference = 'Stop'
 
 # The python test server for testing Unix Domain Sockets
-# (../tests_unix_socket/server.py) does not currently support AF_UNIX on Windows.
+# (../tests_unix_socket/unix_socket_server.py) does not currently support AF_UNIX on Windows.
 # See https://github.com/python/cpython/issues/77589
 # Skip for now until this can be easily tested.
-#hurl --unix-socket /unknown tests_ok/unix_socket.hurl
+#hurl --unix-socket build/unix_socket.sock --verbose tests_unix_socket/unix_socket.hurl
 $ErrorActionPreference = 'Continue'
 exit 255
diff --git a/integration/hurl/tests_unix_socket/unix_socket.sh b/integration/hurl/tests_unix_socket/unix_socket.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+set -Eeuo pipefail
+hurl --unix-socket build/unix_socket.sock --verbose tests_unix_socket/unix_socket.hurl
diff --git a/integration/hurl/tests_unix_socket/server.py → ...l/tests_unix_socket/unix_socket_server.py b/integration/hurl/tests_unix_socket/server.py → ...l/tests_unix_socket/unix_socket_server.py