From 4f2fa34a9da06d6897977493d5ae908d54d0bb38 Mon Sep 17 00:00:00 2001 From: purarue <7804791+purarue@users.noreply.github.com> Date: Wed, 13 Nov 2024 10:14:15 -0800 Subject: [PATCH] fix: broken zsh test --- tests/test_zsh.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/test_zsh.py b/tests/test_zsh.py index 99c93fca..44ed41c9 100644 --- a/tests/test_zsh.py +++ b/tests/test_zsh.py @@ -1,6 +1,8 @@ from pathlib import Path +from typing import Callable, Iterator +from itertools import chain -from my.zsh import history, Entry +from my.zsh import _parse_file, _merge_histories, Entry from .common import data @@ -8,6 +10,10 @@ overlap_file = data("zsh/overlap_history") +def _parse_and_merge(inputs: Callable[[], Iterator[Path]]) -> Iterator[Entry]: + yield from _merge_histories(*chain(map(_parse_file, inputs()))) + + def test_single_file() -> None: """ test that a single zsh parse works and for an entry in the history @@ -16,7 +22,7 @@ def test_single_file() -> None: def zsh_small_test(): yield Path(history_file) - items = list(history(from_paths=zsh_small_test)) + items = list(_parse_and_merge(inputs=zsh_small_test)) assert len(items) == 11 from datetime import datetime, timezone @@ -47,5 +53,5 @@ def zsh_multiple_tests(): yield Path(history_file) yield Path(overlap_file) - items = list(history(from_paths=zsh_multiple_tests)) + items = list(_parse_and_merge(inputs=zsh_multiple_tests)) assert len(items) == 11