Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix test suite on FreeBSD #842

Merged
merged 3 commits into from Sep 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions changelog.rst
Expand Up @@ -8,8 +8,9 @@ Changelog

2021-xx-xx • `full history <https://github.com/gorakhargosh/watchdog/compare/v2.1.5...master>`__

-
- Thanks to our beloved contributors: @
- [bsd] Fixed returned paths in ``kqueue.py`` and restored the overall results of the test suite (`#842 <https://github.com/gorakhargosh/watchdog/pull/842>`_)
- [bsd] Updated FreeBSD CI support (`#841 <https://github.com/gorakhargosh/watchdog/pull/841>`_)
- Thanks to our beloved contributors: @knobix

2.1.5
~~~~~
Expand Down
4 changes: 1 addition & 3 deletions src/watchdog/observers/kqueue.py
Expand Up @@ -76,8 +76,6 @@
import os.path
import select

from pathlib import Path

from watchdog.observers.api import (
BaseObserver,
EventEmitter,
Expand Down Expand Up @@ -127,7 +125,7 @@


def absolute_path(path):
return Path(path).resolve()
return os.path.abspath(os.path.normpath(path))

# Flag tests.

Expand Down
2 changes: 2 additions & 0 deletions tests/test_emitter.py
Expand Up @@ -355,6 +355,7 @@ def test_separate_consecutive_moves():


@pytest.mark.flaky(max_runs=5, min_passes=1, rerun_filter=rerun_filter)
@pytest.mark.skipif(platform.is_bsd(), reason="BSD create another set of events for this test")
def test_delete_self():
mkdir(p('dir1'))
start_watching(p('dir1'))
Expand Down Expand Up @@ -642,6 +643,7 @@ def test_move_nested_subdirectories_on_windows():


@pytest.mark.flaky(max_runs=5, min_passes=1, rerun_filter=rerun_filter)
@pytest.mark.skipif(platform.is_bsd(), reason="BSD create another set of events for this test")
def test_file_lifecyle():
start_watching()

Expand Down