Fix wait_epoll() when the fd is read- and write-ready

We follow the implementation of EpollSelector.select(). The
test_wait_ready() introduced previously added now passes for
wait_epoll().

diff --git a/psycopg/psycopg/waiting.py b/psycopg/psycopg/waiting.py
index 2c2f75bc934ee41abb657c0ed2fc725d627b1e2a..59bbd6559bc409fdd1aa2332f08492fc582cf7da 100644 (file)
--- a/psycopg/psycopg/waiting.py
+++ b/psycopg/psycopg/waiting.py
@@ -232,11 +232,12 @@ def wait_epoll(
             while not fileevs:
                 fileevs = epoll.poll(timeout)
             ev = fileevs[0][1]
+            ready = 0
             if ev & ~select.EPOLLOUT:
-                s = Ready.R
-            else:
-                s = Ready.W
-            s = gen.send(s)
+                ready = Ready.R
+            if ev & ~select.EPOLLIN:
+                ready |= Ready.W
+            s = gen.send(ready)
             evmask = poll_evmasks[s]
             epoll.modify(fileno, evmask)