tests/extmod/select_poll_fd.py: fix limiting

dhalbert · dhalbert · commit aa943b316fb3 · 2024-08-20T20:57:13.000-04:00
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -47,7 +47,9 @@ jobs:
     - name: Build unix port
       run: make -C ports/unix VARIANT=coverage -j4
     - name: Run tests
-      run: ./run-tests.py -j4 ${{ env[format('TEST_{0}', matrix.test)] }}
+      run: |
+        ulimit -n
+        ulimit -n 1024 && ./run-tests.py -j4 ${{ env[format('TEST_{0}', matrix.test)] }}
       working-directory: tests
     - name: Print failure info
       run: ./run-tests.py -j4 --print-failures
diff --git a/tests/extmod/select_poll_fd.py b/tests/extmod/select_poll_fd.py
@@ -1,5 +1,4 @@
 # Test select.poll in combination with file descriptors.
-
 try:
     import select, errno
 
@@ -8,6 +7,14 @@
     print("SKIP")
     raise SystemExit
 
+# CIRCUITPY-CHANGE: set max number of file descriptors here for CPython comparison test.
+# In MicroPython, this is done in ci.sh with `ulimit -n`.
+try:
+    import resource
+    resource.setrlimit(resource.RLIMIT_NOFILE, (1024, 1024))
+except ImportError:
+    pass
+
 # Check that poll supports registering file descriptors (integers).
 try:
     select.poll().register(0)
@@ -37,12 +44,7 @@
 # Test registering a very large number of file descriptors (will trigger
 # EINVAL due to more than OPEN_MAX fds). Typically it's 1024 (and on GitHub CI
 # we force this via `ulimit -n 1024`).
-# CIRCUITPY-CHANGE: set max number of file descriptors here
-try:
-    import resource
-    resource.setrlimit(resource.RLIMIT_NOFILE, (1024, 1024))
-except ImportError:
-    pass
+# CIRCUITPY-CHANGE: set max number of fd's above.
 poller = select.poll()
 for fd in range(6000):
     poller.register(fd)
