File 0000-fix-socket-specs-when-network-not-availabl... of Package crystal

Overview Repositories Revisions Requests Users Attributes Meta

File 0000-fix-socket-specs-when-network-not-available.patch of Package crystal (Revision 99ff398eb22c892974d6ff8d6f4b3b17)

Currently displaying revision 99ff398eb22c892974d6ff8d6f4b3b17 , Show latest

From 8d265c30c358816f9300dd9a40408c3f6e98b660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Sun, 15 Jan 2023 16:35:21 +0100
Subject: [PATCH 1/4] Fix UDP socket spec when network not available

---
 spec/std/socket/udp_socket_spec.cr | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/spec/std/socket/udp_socket_spec.cr b/spec/std/socket/udp_socket_spec.cr
index 919d8ce9f94..24236c2109c 100644
--- a/spec/std/socket/udp_socket_spec.cr
+++ b/spec/std/socket/udp_socket_spec.cr
@@ -130,7 +130,16 @@ describe UDPSocket, tags: "network" do
                  raise "Unsupported IP address family: #{family}"
                end
 
-        udp.join_group(addr)
+        begin
+          udp.join_group(addr)
+        rescue e : Socket::Error
+          if e.os_error == Errno::ENODEV
+            pending!("Multicast device selection not available on this host")
+          else
+            raise e
+          end
+        end
+
         udp.multicast_loopback = true
         udp.multicast_loopback?.should eq(true)

From 2b71c32a79b89652bc7b150084179d0055576254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Sun, 15 Jan 2023 16:41:33 +0100
Subject: [PATCH 2/4] Fix `TCP` socket specs when network is not available

Adds `Errno::EAI_EAGAIN` as an accepted error code.
---
 spec/std/socket/tcp_server_spec.cr | 4 ++--
 spec/std/socket/tcp_socket_spec.cr | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/std/socket/tcp_server_spec.cr b/spec/std/socket/tcp_server_spec.cr
index 454294bef2c..86f56385d0e 100644
--- a/spec/std/socket/tcp_server_spec.cr
+++ b/spec/std/socket/tcp_server_spec.cr
@@ -88,14 +88,14 @@ describe TCPServer, tags: "network" do
         err = expect_raises(Socket::Error, "Hostname lookup for doesnotexist.example.org. failed") do
           TCPServer.new("doesnotexist.example.org.", 12345)
         end
-        err.os_error.should eq({% if flag?(:win32) %}WinError::WSAHOST_NOT_FOUND{% else %}Errno.new(LibC::EAI_NONAME){% end %})
+        [WinError::WSAHOST_NOT_FOUND, Errno.new(LibC::EAI_NONAME), Errno.new(LibC::EAI_AGAIN)].should contain err.os_error
       end
 
       it "raises (rather than segfault on darwin) when host doesn't exist and port is 0" do
         err = expect_raises(Socket::Error, "Hostname lookup for doesnotexist.example.org. failed") do
           TCPServer.new("doesnotexist.example.org.", 0)
         end
-        err.os_error.should eq({% if flag?(:win32) %}WinError::WSAHOST_NOT_FOUND{% else %}Errno.new(LibC::EAI_NONAME){% end %})
+        [WinError::WSAHOST_NOT_FOUND, Errno.new(LibC::EAI_NONAME), Errno.new(LibC::EAI_AGAIN)].should contain err.os_error
       end
     end
 
diff --git a/spec/std/socket/tcp_socket_spec.cr b/spec/std/socket/tcp_socket_spec.cr
index b0746ef914c..64f9f1757a5 100644
--- a/spec/std/socket/tcp_socket_spec.cr
+++ b/spec/std/socket/tcp_socket_spec.cr
@@ -67,14 +67,14 @@ describe TCPSocket, tags: "network" do
         error = expect_raises(Socket::Error, "Hostname lookup for doesnotexist.example.org. failed") do
           TCPSocket.new("doesnotexist.example.org.", 12345)
         end
-        error.os_error.should eq({% if flag?(:win32) %}WinError::WSAHOST_NOT_FOUND{% else %}Errno.new(LibC::EAI_NONAME){% end %})
+        [WinError::WSAHOST_NOT_FOUND, Errno.new(LibC::EAI_NONAME), Errno.new(LibC::EAI_AGAIN)].should contain error.os_error
       end
 
       it "raises (rather than segfault on darwin) when host doesn't exist and port is 0" do
         error = expect_raises(Socket::Error, "Hostname lookup for doesnotexist.example.org. failed") do
           TCPSocket.new("doesnotexist.example.org.", 0)
         end
-        error.os_error.should eq({% if flag?(:win32) %}WinError::WSAHOST_NOT_FOUND{% else %}Errno.new(LibC::EAI_NONAME){% end %})
+        [WinError::WSAHOST_NOT_FOUND, Errno.new(LibC::EAI_NONAME), Errno.new(LibC::EAI_AGAIN)].should contain error.os_error
       end
     end

From 97c1789cb909a306c8425fd4e77f9aee22772254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Mon, 16 Jan 2023 15:29:49 +0100
Subject: [PATCH 3/4] Fix for win32

---
 spec/std/socket/tcp_server_spec.cr | 14 ++++++++++++--
 spec/std/socket/tcp_socket_spec.cr | 14 ++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/spec/std/socket/tcp_server_spec.cr b/spec/std/socket/tcp_server_spec.cr
index 86f56385d0e..c33d546827d 100644
--- a/spec/std/socket/tcp_server_spec.cr
+++ b/spec/std/socket/tcp_server_spec.cr
@@ -88,14 +88,24 @@ describe TCPServer, tags: "network" do
         err = expect_raises(Socket::Error, "Hostname lookup for doesnotexist.example.org. failed") do
           TCPServer.new("doesnotexist.example.org.", 12345)
         end
-        [WinError::WSAHOST_NOT_FOUND, Errno.new(LibC::EAI_NONAME), Errno.new(LibC::EAI_AGAIN)].should contain err.os_error
+        # FIXME: Resolve special handling for win32. The error code handling should be identical.
+        {% if flag?(:win32) %}
+          [WinError::WSAHOST_NOT_FOUND, WinError::WSATRY_AGAIN].should contain err.os_error
+        {% else %}
+          [Errno.new(LibC::EAI_NONAME), Errno.new(LibC::EAI_AGAIN)].should contain err.os_error
+        {% end %}
       end
 
       it "raises (rather than segfault on darwin) when host doesn't exist and port is 0" do
         err = expect_raises(Socket::Error, "Hostname lookup for doesnotexist.example.org. failed") do
           TCPServer.new("doesnotexist.example.org.", 0)
         end
-        [WinError::WSAHOST_NOT_FOUND, Errno.new(LibC::EAI_NONAME), Errno.new(LibC::EAI_AGAIN)].should contain err.os_error
+        # FIXME: Resolve special handling for win32. The error code handling should be identical.
+        {% if flag?(:win32) %}
+          [WinError::WSAHOST_NOT_FOUND, WinError::WSATRY_AGAIN].should contain err.os_error
+        {% else %}
+          [Errno.new(LibC::EAI_NONAME), Errno.new(LibC::EAI_AGAIN)].should contain err.os_error
+        {% end %}
       end
     end
 
diff --git a/spec/std/socket/tcp_socket_spec.cr b/spec/std/socket/tcp_socket_spec.cr
index 64f9f1757a5..2cda11d3cbd 100644
--- a/spec/std/socket/tcp_socket_spec.cr
+++ b/spec/std/socket/tcp_socket_spec.cr
@@ -67,14 +67,24 @@ describe TCPSocket, tags: "network" do
         error = expect_raises(Socket::Error, "Hostname lookup for doesnotexist.example.org. failed") do
           TCPSocket.new("doesnotexist.example.org.", 12345)
         end
-        [WinError::WSAHOST_NOT_FOUND, Errno.new(LibC::EAI_NONAME), Errno.new(LibC::EAI_AGAIN)].should contain error.os_error
+        # FIXME: Resolve special handling for win32. The error code handling should be identical.
+        {% if flag?(:win32) %}
+          [WinError::WSAHOST_NOT_FOUND, WinError::WSATRY_AGAIN].should contain err.os_error
+        {% else %}
+          [Errno.new(LibC::EAI_NONAME), Errno.new(LibC::EAI_AGAIN)].should contain err.os_error
+        {% end %}
       end
 
       it "raises (rather than segfault on darwin) when host doesn't exist and port is 0" do
         error = expect_raises(Socket::Error, "Hostname lookup for doesnotexist.example.org. failed") do
           TCPSocket.new("doesnotexist.example.org.", 0)
         end
-        [WinError::WSAHOST_NOT_FOUND, Errno.new(LibC::EAI_NONAME), Errno.new(LibC::EAI_AGAIN)].should contain error.os_error
+        # FIXME: Resolve special handling for win32. The error code handling should be identical.
+        {% if flag?(:win32) %}
+          [WinError::WSAHOST_NOT_FOUND, WinError::WSATRY_AGAIN].should contain err.os_error
+        {% else %}
+          [Errno.new(LibC::EAI_NONAME), Errno.new(LibC::EAI_AGAIN)].should contain err.os_error
+        {% end %}
       end
     end

From 5a45c65361edde331296e1907fbeee9875038e4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Mon, 16 Jan 2023 16:07:18 +0100
Subject: [PATCH 4/4] Apply suggestions from code review

Co-authored-by: Sijawusz Pur Rahnama <sija@sija.pl>
---
 spec/std/socket/tcp_socket_spec.cr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/std/socket/tcp_socket_spec.cr b/spec/std/socket/tcp_socket_spec.cr
index 2cda11d3cbd..b82db28e6be 100644
--- a/spec/std/socket/tcp_socket_spec.cr
+++ b/spec/std/socket/tcp_socket_spec.cr
@@ -64,7 +64,7 @@ describe TCPSocket, tags: "network" do
       end
 
       it "raises when host doesn't exist" do
-        error = expect_raises(Socket::Error, "Hostname lookup for doesnotexist.example.org. failed") do
+        err = expect_raises(Socket::Error, "Hostname lookup for doesnotexist.example.org. failed") do
           TCPSocket.new("doesnotexist.example.org.", 12345)
         end
         # FIXME: Resolve special handling for win32. The error code handling should be identical.
@@ -76,7 +76,7 @@ describe TCPSocket, tags: "network" do
       end
 
       it "raises (rather than segfault on darwin) when host doesn't exist and port is 0" do
-        error = expect_raises(Socket::Error, "Hostname lookup for doesnotexist.example.org. failed") do
+        err = expect_raises(Socket::Error, "Hostname lookup for doesnotexist.example.org. failed") do
           TCPSocket.new("doesnotexist.example.org.", 0)
         end
         # FIXME: Resolve special handling for win32. The error code handling should be identical.

Places

File 0000-fix-socket-specs-when-network-not-available.patch of Package crystal (Revision 99ff398eb22c892974d6ff8d6f4b3b17)

Places