Update expected contents of p4info files.

[kfcripps]

This is what I get when I run P4TEST_REPLACE=1 make check on main ToT.

[fruffy]

Can you rebase and check whether this still applies?

[kfcripps]

@fruffy Sure, is #4348 expected to fix this?

[fruffy]

@fruffy Sure, is #4348 expected to fix this?

No, was thinking there was a mismatch with #4350. But that does not seem to be the case. In either case, in order to merge this PR it needs to up-to-date with main.

[kfcripps]

Ok, I will rebase after checking that the CI passes.

[fruffy]

#4352, which is approved should also fix this. But we can merge yours first to unblock you.

[kfcripps]

@fruffy If you think that #4352 will be merged today, then I can wait and I'll close this.

[kfcripps]

Do any of the jobs spuriously fail? I noticed that the CI was red earlier, and now it is yellow, so I'm assuming that either someone re-triggered the failing job or it was re-triggered automatically, and I'm wondering if it is the same job that is currently failing in #4357.

[kfcripps]

Ah, looks like it failed again here

[fruffy]

This has been recently, unclear what changed to cause this failure. A fix might be to increase the waiting time in the PTF tests.

[fruffy]

I merged #4352, which should make this PR obsolete.

[kfcripps]

Thank you @fruffy