Skip to content

Commit

Permalink
Replace trigger.is_empty with inverted trigger.is_active
Browse files Browse the repository at this point in the history
  • Loading branch information
olzhasar committed Feb 5, 2024
1 parent 7bc3894 commit d51c8b0
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions pytest_watcher/trigger.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ def emit(self):
with self.lock:
self.value = time.time()

def is_empty(self):
return self.value == 0
def is_active(self):
return self.value != 0

def release(self):
with self.lock:
Expand Down
18 changes: 9 additions & 9 deletions tests/test_event_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def test_event_types_watched(event_type, trigger: watcher.Trigger):
handler = watcher.EventHandler(trigger)
handler.dispatch(event)

assert not trigger.is_empty()
assert trigger.is_active()


def test_event_types_not_watched(trigger: watcher.Trigger):
Expand All @@ -28,7 +28,7 @@ def test_event_types_not_watched(trigger: watcher.Trigger):
handler = watcher.EventHandler(trigger)
handler.dispatch(event)

assert trigger.is_empty()
assert not trigger.is_active()


@pytest.mark.parametrize(
Expand All @@ -40,7 +40,7 @@ def test_file_moved_dest_watched(event_class, trigger: watcher.Trigger):
handler = watcher.EventHandler(trigger)
handler.dispatch(event)

assert not trigger.is_empty()
assert trigger.is_active()


@pytest.mark.parametrize(
Expand All @@ -52,7 +52,7 @@ def test_file_moved_dest_not_watched(event_class, trigger: watcher.Trigger):
handler = watcher.EventHandler(trigger)
handler.dispatch(event)

assert trigger.is_empty()
assert not trigger.is_active()


@pytest.mark.parametrize("path", ["main.py", "./main.py", "/home/project/main.py"])
Expand All @@ -62,7 +62,7 @@ def test_patterns_default_watched(trigger: watcher.Trigger, path: str):
handler = watcher.EventHandler(trigger)
handler.dispatch(event)

assert not trigger.is_empty()
assert trigger.is_active()


@pytest.mark.parametrize("path", ["main.pyc", "sqlite.db", "/home/project/file.txt"])
Expand All @@ -72,7 +72,7 @@ def test_patterns_default_not_watched(trigger: watcher.Trigger, path: str):
handler = watcher.EventHandler(trigger)
handler.dispatch(event)

assert trigger.is_empty()
assert not trigger.is_active()


@pytest.mark.parametrize(
Expand All @@ -92,7 +92,7 @@ def test_patterns_custom_watched(
handler = watcher.EventHandler(trigger, patterns=patterns)
handler.dispatch(event)

assert not trigger.is_empty()
assert trigger.is_active()


@pytest.mark.parametrize(
Expand All @@ -111,7 +111,7 @@ def test_patterns_custom_not_watched(
handler = watcher.EventHandler(trigger, patterns=patterns)
handler.dispatch(event)

assert trigger.is_empty()
assert not trigger.is_active()


@pytest.mark.parametrize(
Expand All @@ -130,4 +130,4 @@ def test_patterns_ignore_not_watched(
handler = watcher.EventHandler(trigger, ignore_patterns=ignore_patterns)
handler.dispatch(event)

assert trigger.is_empty()
assert not trigger.is_active()
6 changes: 3 additions & 3 deletions tests/test_watcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def test_main_loop_does_not_invoke_runner_without_trigger(
mock_subprocess_run.assert_not_called()
mock_time_sleep.assert_called_once_with(LOOP_DELAY)

assert not trigger.is_empty()
assert trigger.is_active()


@freeze_time("2020-01-01 00:00:00")
Expand All @@ -48,7 +48,7 @@ def test_main_loop_does_not_invoke_runner_before_delay(
mock_subprocess_run.assert_not_called()
mock_time_sleep.assert_called_once_with(LOOP_DELAY)

assert not trigger.is_empty()
assert trigger.is_active()


@freeze_time("2020-01-01 00:00:00")
Expand All @@ -70,7 +70,7 @@ def test_main_loop_invokes_runner_after_delay(
mock_subprocess_run.assert_called_once_with(["custom", "foo", "bar"])
mock_time_sleep.assert_called_once_with(LOOP_DELAY)

assert trigger.is_empty()
assert not trigger.is_active()


@freeze_time("2020-01-01 00:00:00")
Expand Down

0 comments on commit d51c8b0

Please sign in to comment.