summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2021-12-29 20:45:02 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2021-12-29 20:45:02 +0100
commit898fa1b0013a82f1909450d6d6e3923f67c01f4a (patch)
tree6e302ac265e8b0fd980b2244fc689181843737ea
parent75fd6655851d43d8d8a157c6f6d37e4fc2594cf1 (diff)
downloadpsutil-history-urls.tar.gz
try to fix CIhistory-urls
Signed-off-by: Giampaolo Rodola <g.rodola@gmail.com>
-rw-r--r--.github/workflows/build.yml6
-rwxr-xr-xpsutil/tests/test_process.py6
2 files changed, 7 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5fd6e735..d8940cd0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
fail-fast: false
matrix:
# os: [ubuntu-latest, macos-latest, windows-latest]
- os: [ubuntu-latest, macos-latest]
+ os: [ubuntu-latest, macos-10.15]
include:
- {name: Linux, python: '3.9', os: ubuntu-latest}
env:
@@ -128,7 +128,7 @@ jobs:
python scripts/internal/print_hashes.py wheelhouse/
freebsd:
- runs-on: macos-latest
+ runs-on: macos-10.15
steps:
- name: Cancel previous runs
uses: styfle/cancel-workflow-action@0.6.0
@@ -139,7 +139,7 @@ jobs:
- name: Run tests
id: test
- uses: vmactions/freebsd-vm@v0.1.4
+ uses: vmactions/freebsd-vm@v0.1.5
with:
usesh: true
prepare: pkg install -y gcc python3
diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
index 08f16647..c9059e33 100755
--- a/psutil/tests/test_process.py
+++ b/psutil/tests/test_process.py
@@ -1413,11 +1413,13 @@ class TestProcess(PsutilTestCase):
code = textwrap.dedent("""
#include <unistd.h>
#include <fcntl.h>
+
char * const argv[] = {"cat", 0};
char * const envp[] = {"A=1", "X", "C=3", 0};
+
int main(void) {
- /* Close stderr on exec so parent can wait for the execve to
- * finish. */
+ // Close stderr on exec so parent can wait for the
+ // execve to finish.
if (fcntl(2, F_SETFD, FD_CLOEXEC) != 0)
return 0;
return execve("/bin/cat", argv, envp);