mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-06 07:15:09 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e4f5e49ff7 |
@@ -19,6 +19,16 @@ accepts both, but the store flags the old spelling as deprecated
|
|||||||
|
|
||||||
## Unreleased
|
## Unreleased
|
||||||
|
|
||||||
|
### Tooling
|
||||||
|
|
||||||
|
- `test/test_sports_helpers.py`'s parity tests pass again with
|
||||||
|
`LEDMATRIX_PLUGINS` set. The scoreboards deleted their copies of the
|
||||||
|
`sports_helpers` bodies and constants when they adopted `SportsHelpersMixin`
|
||||||
|
(ledmatrix-plugins #563/#564), and the 19 tests still expected them. A copy
|
||||||
|
that is gone now counts as adopted when the plugin imports
|
||||||
|
`src.common.sports_helpers`, as the stage 3/4 and game-over parity tests
|
||||||
|
already do; a copy that remains must still match.
|
||||||
|
|
||||||
## 3.8.2
|
## 3.8.2
|
||||||
|
|
||||||
The display hands freed memory back to the OS (#774), and sports consolidation
|
The display hands freed memory back to the OS (#774), and sports consolidation
|
||||||
|
|||||||
+42
-12
@@ -8,7 +8,9 @@ loses those tests with it.
|
|||||||
The parity class is what keeps "byte-identical" true after this lands. Point
|
The parity class is what keeps "byte-identical" true after this lands. Point
|
||||||
LEDMATRIX_PLUGINS at a ledmatrix-plugins checkout and every promoted body is
|
LEDMATRIX_PLUGINS at a ledmatrix-plugins checkout and every promoted body is
|
||||||
compared, as a docstring-stripped AST, against every plugin copy that carries
|
compared, as a docstring-stripped AST, against every plugin copy that carries
|
||||||
it. Without the variable it skips rather than fails, since core CI has no
|
it. A copy that is gone counts as adopted when the plugin imports
|
||||||
|
src.common.sports_helpers (plugins#563/#564 did that for every scoreboard).
|
||||||
|
Without the variable it skips rather than fails, since core CI has no
|
||||||
plugins checkout; ledmatrix-plugins CI runs the same comparison against core
|
plugins checkout; ledmatrix-plugins CI runs the same comparison against core
|
||||||
(scripts/check_sports_helpers_parity.py, ledmatrix-plugins#495).
|
(scripts/check_sports_helpers_parity.py, ledmatrix-plugins#495).
|
||||||
"""
|
"""
|
||||||
@@ -572,6 +574,24 @@ def _core_definitions():
|
|||||||
return out
|
return out
|
||||||
|
|
||||||
|
|
||||||
|
def _sports_source(root, sport):
|
||||||
|
return (root / f"{sport}-scoreboard" / "sports.py").read_text(encoding="utf-8")
|
||||||
|
|
||||||
|
|
||||||
|
def _adopted(source):
|
||||||
|
"""Gone is fine once the plugin uses the module; otherwise the finder is
|
||||||
|
not seeing its copy."""
|
||||||
|
name = sports_helpers.__name__
|
||||||
|
for node in ast.walk(ast.parse(source)):
|
||||||
|
if isinstance(node, ast.ImportFrom):
|
||||||
|
if node.module == name or any(
|
||||||
|
f"{node.module}.{a.name}" == name for a in node.names):
|
||||||
|
return True
|
||||||
|
elif isinstance(node, ast.Import) and any(a.name == name for a in node.names):
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
class TestParityWithPlugins:
|
class TestParityWithPlugins:
|
||||||
@pytest.mark.parametrize("name", sorted(PROMOTED))
|
@pytest.mark.parametrize("name", sorted(PROMOTED))
|
||||||
def test_body_matches_every_plugin_copy(self, name):
|
def test_body_matches_every_plugin_copy(self, name):
|
||||||
@@ -580,11 +600,11 @@ class TestParityWithPlugins:
|
|||||||
ours = _dump(_core_definitions()[name])
|
ours = _dump(_core_definitions()[name])
|
||||||
drifted, missing = [], []
|
drifted, missing = [], []
|
||||||
for sport in carriers:
|
for sport in carriers:
|
||||||
defs = _definitions(ast.parse(
|
source = _sports_source(root, sport)
|
||||||
(root / f"{sport}-scoreboard" / "sports.py").read_text(encoding="utf-8")))
|
theirs = _definitions(ast.parse(source))[where].get(plugin_name)
|
||||||
theirs = defs[where].get(plugin_name)
|
|
||||||
if theirs is None:
|
if theirs is None:
|
||||||
missing.append(sport)
|
if not _adopted(source):
|
||||||
|
missing.append(sport)
|
||||||
elif _dump(theirs) != ours:
|
elif _dump(theirs) != ours:
|
||||||
drifted.append(sport)
|
drifted.append(sport)
|
||||||
assert missing == [], f"{plugin_name} no longer in: {missing}"
|
assert missing == [], f"{plugin_name} no longer in: {missing}"
|
||||||
@@ -594,10 +614,20 @@ class TestParityWithPlugins:
|
|||||||
|
|
||||||
@pytest.mark.parametrize("sport", SCOREBOARDS)
|
@pytest.mark.parametrize("sport", SCOREBOARDS)
|
||||||
def test_constants_match(self, sport):
|
def test_constants_match(self, sport):
|
||||||
root = _plugins_root()
|
source = _sports_source(_plugins_root(), sport)
|
||||||
defs = _definitions(ast.parse(
|
defs = _definitions(ast.parse(source))
|
||||||
(root / f"{sport}-scoreboard" / "sports.py").read_text(encoding="utf-8")))
|
expected = {
|
||||||
assert ast.literal_eval(defs["module"]["_MIN_WINDOW_DAYS"].value) == MIN_WINDOW_DAYS
|
("module", "_MIN_WINDOW_DAYS"): MIN_WINDOW_DAYS,
|
||||||
assert ast.literal_eval(defs["module"]["_MAX_WINDOW_DAYS"].value) == MAX_WINDOW_DAYS
|
("module", "_MAX_WINDOW_DAYS"): MAX_WINDOW_DAYS,
|
||||||
gap = defs["SportsCore"]["_DWELL_REENTRY_GAP_SECONDS"].value
|
("SportsCore", "_DWELL_REENTRY_GAP_SECONDS"):
|
||||||
assert math.isclose(ast.literal_eval(gap), SportsHelpersMixin._DWELL_REENTRY_GAP_SECONDS)
|
SportsHelpersMixin._DWELL_REENTRY_GAP_SECONDS,
|
||||||
|
}
|
||||||
|
missing = []
|
||||||
|
for (where, name), value in expected.items():
|
||||||
|
node = defs[where].get(name)
|
||||||
|
if node is None:
|
||||||
|
if not _adopted(source):
|
||||||
|
missing.append(name)
|
||||||
|
else:
|
||||||
|
assert math.isclose(ast.literal_eval(node.value), value), name
|
||||||
|
assert missing == [], f"not found in {sport}: {missing}"
|
||||||
|
|||||||
Reference in New Issue
Block a user