mvdan.cc / cue
this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

cmd/cue: deflake cue_after test

Currently there are two commands that are intended to run in sequence,
each of which sleep for a while, then print the time in unix
milliseconds. The test expects the two times to be different. Currently
the second command command sleep duration is 0ms, which means that if it
happens that the CUE logic runs in less than a millisecond, the test
will fail. The reason for the first sleep is almost certainly to provoke
a test failure if the second command doesn't wait for the first. So it
doesn't matter if it's quite a bit shorter than it currently is - the
only danger is a false negative. But the second sleep needs to be
non-zero to guarantee that the clock has advanced by at least some time.

Since this change makes the test take considerably less time, it seems
reasonable to remove the `-short` skipping.

Also, we can use `strconv.Atoi` which does arbitrary precision
int parsing as a slight simplification over `strconv.ParseInt`.

Also, make the output more useful if the test _does_ happen to flake
again by printing the actual values of the timestamps.

Signed-off-by: Roger Peppe <rogpeppe@gmail.com>
Change-Id: I3c01a3ea87a3638966f6ff2850cba77f5b113211
Reviewed-on: https://cue.gerrithub.io/c/cue-lang/cue/+/1230088
Unity-Result: CUE porcuepine <cue.porcuepine@gmail.com>
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
TryBot-Result: CUEcueckoo <cueckoo@cuelang.org>

Roger Peppe 4504db07 58cbd0c3

+10 -8
+10 -8
cmd/cue/cmd/testdata/script/cmd_after.txtar
··· 1 - [short] skip 'this test uses sleeps' 2 - 3 1 exec cue cmd after 4 2 cmp stdout expect-stdout 5 3 6 4 -- expect-stdout -- 7 5 run also 8 6 run 9 - true 7 + timestamps are in order 10 8 SUCCESS 11 9 -- after_tool.cue -- 12 10 package home ··· 26 24 command: after: { 27 25 group: { 28 26 t1: exec.Run & { 29 - cmd: ["testcmd", "sleep_and_print", "200ms", "UNIX_MILLI"] 27 + cmd: ["testcmd", "sleep_and_print", "50ms", "UNIX_MILLI"] 30 28 stdout: string 31 29 $after: top1 32 30 } ··· 37 35 } 38 36 } 39 37 t3: cli.Print & { 40 - text: strconv.FormatBool( 41 - strconv.ParseInt(strings.TrimSpace(group.t1.stdout), 10, 64) < 42 - strconv.ParseInt(strings.TrimSpace(group.t2.stdout), 10, 64) 43 - ) 38 + _t1: strconv.Atoi(strings.TrimSpace(group.t1.stdout)) 39 + _t2: strconv.Atoi(strings.TrimSpace(group.t2.stdout)) 40 + if _t1 <= _t2 { 41 + text: "timestamps are in order" 42 + } 43 + if _t1 > _t2 { 44 + text: "out of order timestamps; t1: \(_t1); t2: \(_t2)" 45 + } 44 46 } 45 47 t4: cli.Print & { 46 48 text: "SUCCESS"