Gittrac #4115:  Improved status file-checking tests to require that
lines are found in the specified order, to get ready for changes to
the new format.