Skip to content

Commit c05db7a

Browse files
committed
testsuite: fix eventlog usage in t2355-resource-journal.t
Problem: t2355-resource-journal.t assumes the output of `flux resource eventlog` is JSON, but this is no longer true. Pass `-f json` to the command to force JSON output.
1 parent b2d3695 commit c05db7a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

t/t2355-resource-journal.t

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ test_expect_success 'unload the scheduler' '
1111
'
1212

1313
test_expect_success 'flux resource eventlog --wait works' '
14-
flux resource eventlog --wait=resource-define | tee eventlog
14+
flux resource eventlog -f json --wait=resource-define | tee eventlog
1515
'
1616
test_expect_success '1st event: restart online=""' '
1717
head -1 eventlog | tee eventlog.1 &&
@@ -37,7 +37,7 @@ test_expect_success 'reload resource with monitor-force-up' '
3737
flux module reload resource monitor-force-up
3838
'
3939
test_expect_success 'flux resource eventlog works' '
40-
flux resource eventlog --wait=resource-define >forcelog
40+
flux resource eventlog -f json --wait=resource-define >forcelog
4141
'
4242
test_expect_success '1st event: restart online=0-1' '
4343
head -1 forcelog >forcelog.1 &&
@@ -74,7 +74,7 @@ test_expect_success 'run restartable flux instance, drain 0' '
7474
'
7575
test_expect_success 'restart flux instance, dump eventlog' '
7676
flux start --setattr=statedir=$(pwd) \
77-
flux resource eventlog --wait=resource-define | tee restartlog
77+
flux resource eventlog -f json --wait=resource-define | tee restartlog
7878
'
7979
test_expect_success '1st event: drain idset=0 reason=testing' '
8080
head -1 restartlog | tee restartlog.1 &&

0 commit comments

Comments
 (0)