diff --git a/nix/tests/vm/lib/tests/test_checks.py b/nix/tests/vm/lib/tests/test_checks.py index a763366e..dede6580 100644 --- a/nix/tests/vm/lib/tests/test_checks.py +++ b/nix/tests/vm/lib/tests/test_checks.py @@ -1,6 +1,6 @@ import pytest -from komorebi_vm import Checks +from komorebi_vm.core.checks import Checks def test_counts_passes_and_failures(capsys: pytest.CaptureFixture[str]) -> None: diff --git a/nix/tests/vm/lib/tests/test_pixels.py b/nix/tests/vm/lib/tests/test_pixels.py index cdc396f4..609bce09 100644 --- a/nix/tests/vm/lib/tests/test_pixels.py +++ b/nix/tests/vm/lib/tests/test_pixels.py @@ -1,6 +1,6 @@ from PIL import Image, ImageDraw -from komorebi_vm import Rect +from komorebi_vm.core.geometry import Rect from komorebi_vm.core.pixels import leftmost, near, pixel, ring BLUE = (66, 165, 245) diff --git a/scripts/sync-e2e-core b/scripts/sync-e2e-core new file mode 100755 index 00000000..67b353e3 --- /dev/null +++ b/scripts/sync-e2e-core @@ -0,0 +1,51 @@ +#!/usr/bin/env bash +# Keeps a copy of the platform-neutral part of the VM library in step with this repository, while +# that part is on its way to kfw (the plan in docs/dev/vm-tests.md, "Writing a scenario"): the +# package komorebi_vm.core, and the unit tests that belong to it. The source is this repository until +# the move is made, and the script goes with it. +# +# scripts/sync-e2e-core DEST copy into DEST/komorebi_vm/core and DEST/tests +# scripts/sync-e2e-core --check DEST say what differs, and exit 1 if anything does +# +# Nothing else of DEST is touched, and a file of DEST that is not here is reported and left alone. +set -euo pipefail + +check=0 +if [ "${1:-}" = --check ]; then + check=1 + shift +fi +dest=${1:?usage: sync-e2e-core [--check] DEST} +repo=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd) +lib=$repo/nix/tests/vm/lib + +tests=(fake_platform.py test_checks.py test_pixels.py test_snapshot.py test_tiling.py test_focus_moving.py) + +status=0 +sync() { + local from=$1 to=$2 + if [ "$check" = 1 ]; then + diff -r -x __pycache__ "$from" "$to" >/dev/null 2>&1 || { echo "differs: $to"; status=1; } + else + mkdir -p "$to" + rsync -a --delete --exclude __pycache__ "$from"/ "$to"/ + fi +} + +sync "$lib/komorebi_vm/core" "$dest/komorebi_vm/core" + +for t in "${tests[@]}"; do + if [ "$check" = 1 ]; then + cmp -s "$lib/tests/$t" "$dest/tests/$t" || { echo "differs: $dest/tests/$t"; status=1; } + else + mkdir -p "$dest/tests" + cp "$lib/tests/$t" "$dest/tests/$t" + fi +done + +if [ "$check" = 0 ]; then + echo "synced komorebi_vm/core and ${#tests[@]} tests into $dest" +else + [ "$status" = 0 ] && echo "in step" +fi +exit "$status"