Skip to content

Commit 238b3b8

Browse files
committed
(draft)tests: fix flaky TestGracefulShutdown
It seems that is the version not always got in Stdout, but in Stderr. Added CombinedOutput (stdout+stderr) if exec.Cmd.Output() returned "" while executing `tarantool --version`. Closes #503
1 parent aff7842 commit 238b3b8

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

test_helpers/main.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,11 @@ func IsTarantoolVersionLess(majorMin uint64, minorMin uint64, patchMin uint64) (
237237

238238
out, err := exec.Command(getTarantoolExec(), "--version").Output()
239239

240+
// It seems that is the version not always got in Stdout, but in Stderr
241+
if string(out) == "" {
242+
out, err = exec.Command(getTarantoolExec(), "--version").CombinedOutput()
243+
}
244+
240245
if err != nil {
241246
return true, err
242247
}

0 commit comments

Comments
 (0)