From 529b1da5b1182dae9ea930c8c1fa944be127b3f4 Mon Sep 17 00:00:00 2001 From: Samuel Date: Mon, 30 Nov 2020 22:12:40 -0600 Subject: [PATCH] CI: Add python 3.9, labels, disable macOS mount test. By @samuel-w (#734) --- .github/workflows/main.yml | 8 +++++++- tests/test_archives.py | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 60c2967a..16830246 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: fail-fast: false matrix: - python-version: [3.6, 3.7, 3.8] + python-version: [3.6, 3.7, 3.8, 3.9] os: [ubuntu-latest, macos-latest] exclude: # Only test Python 3.7 on macOS @@ -18,6 +18,8 @@ jobs: python-version: 3.6 - os: macos-latest python-version: 3.8 + - os: macos-latest + python-version: 3.9 steps: - uses: actions/checkout@v2 @@ -61,8 +63,12 @@ jobs: coverage run -m pytest - name: Upload coverage to Codecov uses: codecov/codecov-action@v1 + env: + OS: ${{ runner.os }} + python: ${{ matrix.python-version }} with: token: ${{ secrets.CODECOV_TOKEN }} + env_vars: OS, python lint: runs-on: ubuntu-latest steps: diff --git a/tests/test_archives.py b/tests/test_archives.py index 29d857e7..8f1498dd 100644 --- a/tests/test_archives.py +++ b/tests/test_archives.py @@ -1,3 +1,4 @@ +import sys import psutil from collections import namedtuple import pytest @@ -78,6 +79,7 @@ def test_check(qapp, mocker, borg_json_output, qtbot): qtbot.waitUntil(lambda: main.logText.text().startswith(success_text), timeout=3000) +@pytest.mark.skipif(sys.platform == 'darwin', reason="Test currently broken by Homebrew") def test_archive_mount(qapp, qtbot, mocker, borg_json_output, monkeypatch, choose_file_dialog): def psutil_disk_partitions(**kwargs): DiskPartitions = namedtuple('DiskPartitions', ['device', 'mountpoint'])