18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-19 22:44:59 +01:00

test(scenarios): automatic coupler cases (#86)

Re-lands #288, which was merged into feat/exe-test-mode after that
branch had already gone to master, so master never got it.

Two EN57-2000 units on td.scn, one standing, the other rolling into it
without a driver. At 50 km/h their automatic couplers mustn't catch: the
log has to show the collision and the derailment. At 4 km/h they couple
and nothing collides. Nothing reports a result, so both cases end on the
60 s test timeout.

run.py gets log_contains / log_lacks checks on the run's log.txt, and an
"ini" case key for extra eu07.ini lines (here crashdamage yes). The log
checks fail when log.txt is missing or empty: with no log text log_lacks
would pass without checking anything.
This commit is contained in:
jerrrrycho
2026-11-08 21:06:11 +01:00
parent 10c7527a64
commit 85119cc110
5 changed files with 101 additions and 4 deletions

View File

@@ -135,7 +135,7 @@ Python 3.10+, no extra packages. Options:
`cmake-build-*/bin/Release/eu07*.exe`. The build needs the `--test` and `-ini` command
line options.
- name one or more cases to run only those, e.g. `run.py ... eu07_td_timetable`.
- `-j N` runs N cases at once. Each case prints its results when it is done. All 17 cases
- `-j N` runs N cases at once. Each case prints its results when it is done. All 19 cases
take about 30 s with `-j 4`, loading included.
- `--watch` runs a case the old way, in a visible window in real time (or faster with
`--timespeed N`), closed after the case's `duration`; the exit code isn't checked then. For
@@ -184,6 +184,7 @@ which could have been writing it.
| `track_friction` | set the friction of every track of the base scenery (default in the sceneries is 0.15), e.g. for slippery rail |
| `track_events` | lines added to tracks of the base scenery, by track name, e.g. `{ "tor1k": "event0 test_pass" }`; only tracks in the scenery file itself, not in its includes |
| `test_config` | lines of a `config` block added to the scenery, e.g. `["test.timeout 90"]`; the block always has `test.vehicle` with the case's lead vehicle, so only its train counts for the pass and the standstill |
| `ini` | extra `eu07.ini` lines for the run, after the common ones of the runner's `-ini` file, e.g. `["crashdamage yes"]` |
| `fragment` | `.scn` file in `cases/` added to the scenery: trainsets after `FirstInit` (before it they derail on unlinked track), the rest before it (launchers read after it never fire) |
| `vars` | values for `{{name}}` in the fragment; a list becomes one line per item |
| `expect` | the result the test mode should end with: `pass`, `fail`, `signal_passed_at_danger`, `timeout`, `standstill` or `error`, or `wall_timeout` for the timeout of the real time watchdog (the timeout code with a verdict saying it was the real time; a case expecting `timeout` fails on it). Default `timeout` for a case with `duration`, else `pass` |
@@ -219,6 +220,12 @@ into the test timeout).
`test_mode_pass_while_moving` reports the pass from `event2` of `tor1k` (the direction the train runs), as the train runs onto
it, with `test.no_movement_before_pass no`, so the test ends with the train still moving.
The `en57_2000_automatic_coupler_*` cases (issue #86) share `td_automatic_coupler_hit.scn`: an
EN57-2000 unit without a driver runs at `vars.velocity` km/h into a standing one, from
`35.6 - vars.offset` m behind it, with `crashdamage yes` in `ini`. At 50 km/h the automatic
couplers mustn't catch and the log has to show the collision and the derailment; at 4 km/h they
couple and neither shows up. Nothing reports a result, so both end on the 60 s test timeout.
Checks (speeds in km/h, times in seconds of physicslog time, distances in metres). Most use
the physicslog Velocity column, which is the wheel speed: it stays at 0 while the wheels are
locked in a skid. The ones marked *vehicle speed* use the vehicle speed column at the end of
@@ -244,6 +251,10 @@ the row instead, logged by builds from this branch on.
after moving off, moves no more than `max_distance` metres, e.g. no creeping on locked wheels.
- `ends_moving` `min_speed`: the last row of the physicslog is at `min_speed` or faster, e.g.
the test ended without waiting for the train to stop.
- `log_contains` `pattern`: a line of the run's `log.txt` matches the regex, e.g. the
`Bad driving: ... collided` message of a collision.
- `log_lacks` `pattern`: no line of the run's `log.txt` matches the regex.
New check types go in `CHECKS` in `run.py`; each gets the physicslog rows and the check's
parameters and returns `(passed, detail)`.
parameters and returns `(passed, detail)`. Checks on the log go in `LOG_CHECKS` and get the
text of `log.txt` instead of the rows.

View File

@@ -0,0 +1,17 @@
{
"description": "Issue #86, the control case: an EN57-2000 unit without a driver rolls at 4 km/h into a standing one on td.scn. Their automatic couplers catch, nothing collides nor derails; nothing reports a result, so the run ends on the 60 s test timeout.",
"base_scenery": "td.scn",
"ini": ["crashdamage yes"],
"fragment": "td_automatic_coupler_hit.scn",
"vars": {
"velocity": "4",
"offset": "30"
},
"expect": "timeout",
"duration": 60,
"timeout": 300,
"checks": [
{ "type": "log_lacks", "pattern": "collided" },
{ "type": "log_lacks", "pattern": "derailed" }
]
}

View File

@@ -0,0 +1,17 @@
{
"description": "Issue #86: an EN57-2000 unit without a driver runs at 50 km/h into a standing one on td.scn. Their automatic couplers mustn't catch at that speed: the units collide and derail; the run ends on the 60 s test timeout.",
"base_scenery": "td.scn",
"ini": ["crashdamage yes"],
"fragment": "td_automatic_coupler_hit.scn",
"vars": {
"velocity": "50",
"offset": "0"
},
"expect": "timeout",
"duration": 60,
"timeout": 300,
"checks": [
{ "type": "log_contains", "pattern": "Bad driving: autotest_\\S+ and autotest_\\S+ collided" },
{ "type": "log_contains", "pattern": "Bad driving: autotest_\\S+ derailed" }
]
}

View File

@@ -0,0 +1,19 @@
// added by tests/scenarios/run.py to td.scn, whose own trainsets were removed.
// two EN57-2000 units, which have automatic couplers at their cab ends, on the straight track 1
// of Stacja1: one stands where td.scn keeps its timetable train, with an AI driver and no
// timetable, so it stays put and logs its physics; the other has no driver and rolls into it at
// {{velocity}} km/h, its front coupler hitting the rear one of the first.
// a trainset's first vehicle stands {{offset}} m past point 1 of its track, the rest towards point 1,
// and a positive velocity runs towards point 2. tdo_n1734 is the 100 m track after tdo_n1725, a unit
// is 64.4 m long: the first one reaches back to 35.6 m into tdo_n1725, so the gap is 35.6 - offset m.
trainset none tdo_n1734 0.0 0.0
node -1 0 {{vehicle}} dynamic pkp\en57-2000_v1 en57-2040_ra 6ba 0 headdriver 255 0 enddynamic
node -1 0 {{vehicle}}_s dynamic pkp\en57-2000_v1 en57-2040_s 6bs 0 nobody 255 0 enddynamic
node -1 0 {{vehicle}}_rb dynamic pkp\en57-2000_v1 en57-2040_rb 6bb 0 nobody 0 0 enddynamic
endtrainset
trainset none tdo_n1725 {{offset}} {{velocity}}
node -1 0 {{vehicle}}_hit_ra dynamic pkp\en57-2000_v1 en57-2040_ra 6ba 0 nobody 255 0 enddynamic
node -1 0 {{vehicle}}_hit_s dynamic pkp\en57-2000_v1 en57-2040_s 6bs 0 nobody 255 0 enddynamic
node -1 0 {{vehicle}}_hit_rb dynamic pkp\en57-2000_v1 en57-2040_rb 6bb 0 nobody 0 0 enddynamic
endtrainset

View File

@@ -476,6 +476,29 @@ CHECKS = {
}
def check_log_contains(log, pattern):
"""A line of the run's log.txt matches the regex, e.g. the "Bad driving" message of a collision."""
found = next((line.strip() for line in log.splitlines() if re.search(pattern, line)), None)
if found is None:
return False, f"no log line matches /{pattern}/"
return True, f"log: {found}"
def check_log_lacks(log, pattern):
"""No line of the run's log.txt matches the regex."""
found = [line.strip() for line in log.splitlines() if re.search(pattern, line)]
if found:
return False, f"{len(found)} log line(s) match /{pattern}/, first: {found[0]}"
return True, f"no log line matches /{pattern}/"
# checks on the text of the run's log.txt rather than on the physicslog rows
LOG_CHECKS = {
"log_contains": check_log_contains,
"log_lacks": check_log_lacks,
}
# ---------------------------------------------------------------- main
@@ -513,7 +536,9 @@ def run_case(name: str, exe: Path, game_dir: Path, timespeed: float, watch: bool
vehicle = f"autotest_{name}"
scenery = build_scenery(case, game_dir, name, vehicle)
ini = out / "autotest.ini"
ini.write_text(TEST_INI.format(timespeed=timespeed), encoding="ascii")
# the case's own settings go last, over the common ones
ini.write_text(TEST_INI.format(timespeed=timespeed) + "".join(line + "\n" for line in case.get("ini", [])),
encoding="ascii")
physicslog = game_dir / "physicslog" / f"{vehicle}.dat"
duration = float(case["duration"]) if "duration" in case else None
@@ -566,9 +591,17 @@ def run_case(name: str, exe: Path, game_dir: Path, timespeed: float, watch: bool
say(f" FAIL no physicslog for '{vehicle}'")
return False
log = read_text(out / "log.txt")
for check in case.get("checks", []):
params = {k: v for k, v in check.items() if k != "type"}
passed, detail = CHECKS[check["type"]](result.rows, **params)
if check["type"] in LOG_CHECKS:
# with no log text a log check proves nothing, log_lacks would pass vacuously
if log.strip():
passed, detail = LOG_CHECKS[check["type"]](log, **params)
else:
passed, detail = False, "log.txt is missing or empty"
else:
passed, detail = CHECKS[check["type"]](result.rows, **params)
say(f" {'PASS' if passed else 'FAIL'} {check['type']}: {detail}")
ok &= passed