From 26d417d97f4aae2bd47b7205d86b24407285dfb8 Mon Sep 17 00:00:00 2001
Message-Id: <26d417d97f4aae2bd47b7205d86b24407285dfb8.1674804446.git.hahn@univention.de>
From: Philipp Hahn <hahn@univention.de>
Date: Wed, 25 Jan 2023 16:14:44 +0100
Subject: [PATCH] fix(Tests/t_ldapobject): Handle closed socket

`pypy3` may have already closed the socket as it is unspecified, when objects
are really freed.
Do not double-close it.

> =================================== FAILURES ===================================
> ________________ Test03_SimpleLDAPObjectWithFileno.test_slapadd ________________
>
> self = <Tests.t_ldapobject.Test03_SimpleLDAPObjectWithFileno testMethod=test_slapadd>
>
>     def test_slapadd(self):
>         with self.assertRaises(ldap.INVALID_DN_SYNTAX):
>             self._ldap_conn.add_s("myAttribute=foobar,ou=Container,%s" % self.server.suffix, [
>                 ("objectClass", b'myClass'),
>                 ("myAttribute", b'foobar'),
>             ])
>
>         self.server.slapadd(SCHEMA_TEMPLATE, ["-n0"])
>         self.server.restart()
> >       self.reset_connection()
>
> Tests/t_ldapobject.py:561:
> _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
> Tests/t_ldapobject.py:665: in reset_connection
>     self._sock.close()
> /usr/lib64/pypy3.9/socket.py:501: in close
>     self._real_close()
> _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
>
> self = <socket.socket [closed] fd=-1, family=AddressFamily.AF_INET, type=SocketKind.SOCK_STREAM, proto=6>
> _ss = <class '_socket.socket'>
>
>     def _real_close(self, _ss=_socket.socket):
>         # This function should not reference any globals. See issue #808164.
> >       _ss.close(self)
> E       OSError: [Errno 9] Bad file descriptor
>
> /usr/lib64/pypy3.9/socket.py:495: OSError
---
 Tests/t_ldapobject.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git Tests/t_ldapobject.py Tests/t_ldapobject.py
index ccc7d21..5617b63 100644
--- Tests/t_ldapobject.py
+++ Tests/t_ldapobject.py
@@ -656,14 +656,20 @@ class Test03_SimpleLDAPObjectWithFileno(Test00_SimpleLDAPObject):
             who=who, cred=cred, fileno=self._sock.fileno(), **kwargs
         )
 
-    def tearDown(self):
-        self._sock.close()
+    def __close_sock(self):
+        try:
+            self._sock.close()
+        except OSError as exc:
+            if exc.errno != errno.EBADF:
+                raise
         delattr(self, '_sock')
+
+    def tearDown(self):
+        self.__close_sock()
         super().tearDown()
 
     def reset_connection(self):
-        self._sock.close()
-        delattr(self, '_sock')
+        self.__close_sock()
         super(Test03_SimpleLDAPObjectWithFileno, self).reset_connection()
 
 
-- 
2.30.2