tests: Fix normalization of nat_timeused in prompt in journal

Command prompts show nat_timeused rounded down to minutes.  They need
to be normalized, or else tests can fail when they take too long, or
cross midnight.  Formatted prompts are normalized correctly (not
actually used since commit 9ca3fa9), but the journal contains raw
prompts.  Normalize them, too.

Smoke test's journal.log is affected, because the server charges at
least 15s per login, which adds up into minutes in this test.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-01-11 12:29:07 +01:00
parent 4ed5694814
commit 48ee722a48
2 changed files with 755 additions and 753 deletions

View file

@ -82,6 +82,8 @@ while (<>) {
### Formatted time ### Formatted time
# nat_timeused in prompt # nat_timeused in prompt
s/^\[[0-9]+(:[0-9]+\] Command \:)/[0$1/; s/^\[[0-9]+(:[0-9]+\] Command \:)/[0$1/;
$pfx =~ s/( output [^ ]* 6) [0-9]+ ([0-9]+$)/$1 0 $2/
if $opt_j;
# TODO command play column time # TODO command play column time
# result of ctime() in many commands # result of ctime() in many commands
$_ = norm_ctime($_) $_ = norm_ctime($_)

File diff suppressed because it is too large Load diff