Skip to content

fix muon tpar tests - #676

Merged
LowriJenkins merged 3 commits into
masterfrom
tpar_fixes
Aug 21, 2026
Merged

fix muon tpar tests#676
LowriJenkins merged 3 commits into
masterfrom
tpar_fixes

Conversation

@rerpha

@rerpharerpha commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

these needed adjusting as the behaviour of FileServer is now different and doesn't let you change input file while the IOC is running (by design)

@rerpharerpha moved this to Flash Review in TasksAug 19, 2026
@FreddieAkeroyd

Copy link
Copy Markdown
Member

Do all the tests pass for you? I get a failure on test_tpar_editor_reset that seems to be due to the PV having <CR><CR><LF> rather than <CR><LF> line ending. The current.tpar also has <LF> rather than <CR><LF> endings. If I apply ISISComputingGroup/EPICS-FileServer#8 the tests pass for me, but maybe the binary was needed for another reason e.g. does the editor widget need <LF> line endings?

@rerpha

Copy link
Copy Markdown
ContributorAuthor

hmm, they did pass locally for me.
I remember having a bit of a game with the binary flags when we first wrote this, i can't recall why though - did you test ISISComputingGroup/EPICS-FileServer#8 with edits from the GUI?

@FreddieAkeroyd

Copy link
Copy Markdown
Member

No I hadn't yet

@rerpha

Copy link
Copy Markdown
ContributorAuthor

i can do so

@rerpha

rerpha commented Aug 20, 2026

Copy link
Copy Markdown
ContributorAuthor

ok - this is what we ran into before:

image

master copy is on the right.

not sure if this is the editor's fault but it seems to just stick newlines (unix style ones too?) after every line.

just tried again, with a make clean uninstall && make of fileserver\master and ioc\master, and all seem to pass on this branch of the ioc test framework?

@FreddieAkeroyd

Copy link
Copy Markdown
Member

It has stuck an extra CR rather than LF - does it think it is an old style Mac? The CR CR LF was what i got that made the test fail, with my fileserver patch i just got CR LF. When you tred again that was with teh fileserver patch or without?

@rerpha

Copy link
Copy Markdown
ContributorAuthor

that was with the fileserver patch

@FreddieAkeroyd

FreddieAkeroyd commented Aug 20, 2026

Copy link
Copy Markdown
Member

@rerpha ignore the FileServer PR, however i found i needed to change the tests to also read in binary, does this still work for you?

@LowriJenkins
LowriJenkins merged commit a1d2be7 into masterAug 21, 2026
2 checks passed
@LowriJenkins
LowriJenkins deleted the tpar_fixes branch August 21, 2026 12:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@rerpha@FreddieAkeroyd@LowriJenkins@Tom-Willemsen