socket connect and bind throws OSError with indicative error message

palaviv · palaviv · commit de0e76baf889 · 2019-03-08T16:43:11.000+02:00
diff --git a/tests/snippets/stdlib_socket.py b/tests/snippets/stdlib_socket.py
@@ -29,9 +29,17 @@
 with assertRaises(TypeError):
 	s.connect(("127.0.0.1", 8888, 8888))
 
+with assertRaises(OSError):
+	# Lets hope nobody is listening on port 1
+	s.connect(("127.0.0.1", 1))
+
 with assertRaises(TypeError):
 	s.bind(("127.0.0.1", 8888, 8888))
 
+with assertRaises(OSError):
+	# Lets hope nobody run this test on machine with ip 1.2.3.4
+	s.bind(("1.2.3.4", 8888))
+
 with assertRaises(TypeError):
 	s.bind((888, 8888))
 
@@ -74,6 +82,10 @@
 sock1.close()
 sock3.close()
 
+s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+with assertRaises(OSError):
+	s.bind(("1.2.3.4", 888))
+
 ### Errors
 with assertRaises(OSError):
 	socket.socket(100, socket.SOCK_STREAM)
diff --git a/vm/src/stdlib/socket.rs b/vm/src/stdlib/socket.rs
@@ -172,21 +172,18 @@ fn socket_connect(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     let mut socket = get_socket(zelf);
 
     match socket.socket_kind {
-        SocketKind::Stream => {
-            if let Ok(stream) = TcpStream::connect(address_string) {
+        SocketKind::Stream => match TcpStream::connect(address_string) {
+            Ok(stream) => {
                 socket.con = Some(Connection::TcpStream(stream));
                 Ok(vm.get_none())
-            } else {
-                // TODO: Socket error
-                Err(vm.new_type_error("socket failed".to_string()))
             }
-        }
+            Err(s) => Err(vm.new_os_error(s.to_string())),
+        },
         SocketKind::Dgram => {
             if let Some(Connection::UdpSocket(con)) = &socket.con {
                 match con.connect(address_string) {
                     Ok(_) => Ok(vm.get_none()),
-                    // TODO: Socket error
-                    Err(_) => Err(vm.new_type_error("socket failed".to_string())),
+                    Err(s) => Err(vm.new_os_error(s.to_string())),
                 }
             } else {
                 Err(vm.new_type_error("".to_string()))
@@ -207,24 +204,20 @@ fn socket_bind(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     let mut socket = get_socket(zelf);
 
     match socket.socket_kind {
-        SocketKind::Stream => {
-            if let Ok(stream) = TcpListener::bind(address_string) {
+        SocketKind::Stream => match TcpListener::bind(address_string) {
+            Ok(stream) => {
                 socket.con = Some(Connection::TcpListener(stream));
                 Ok(vm.get_none())
-            } else {
-                // TODO: Socket error
-                Err(vm.new_type_error("socket failed".to_string()))
             }
-        }
-        SocketKind::Dgram => {
-            if let Ok(dgram) = UdpSocket::bind(address_string) {
+            Err(s) => Err(vm.new_os_error(s.to_string())),
+        },
+        SocketKind::Dgram => match UdpSocket::bind(address_string) {
+            Ok(dgram) => {
                 socket.con = Some(Connection::UdpSocket(dgram));
                 Ok(vm.get_none())
-            } else {
-                // TODO: Socket error
-                Err(vm.new_type_error("socket failed".to_string()))
             }
-        }
+            Err(s) => Err(vm.new_os_error(s.to_string())),
+        },
     }
 }
 
