Skip to content

Commit

Permalink
[mq] working branch - merge 7d0a1aa on top of main at ca70de4
Browse files Browse the repository at this point in the history
{"baseBranch":"main","baseCommit":"ca70de4d45106089f71763ca80357615c3330c25","createdAt":"2024-11-14T17:13:29.553059Z","headSha":"7d0a1aaa4fb0309879a066acb176abcc5e09a8a1","id":"fa2c312f-6f37-4c47-8e0d-ce586a054b6f","priority":"200","pullRequestNumber":"31090","queuedAt":"2024-11-14T17:13:29.552051Z","status":"STATUS_QUEUED"}
  • Loading branch information
dd-mergequeue[bot] authored Nov 14, 2024
2 parents 7573cc5 + 7d0a1aa commit 76302ed
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion pkg/network/protocols/testutil/serverutils.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ func GetDockerPID(dockerName string) (int64, error) {
if err := c.Run(); err != nil {
return 0, fmt.Errorf("failed to get %s pid: %s", dockerName, stderr.String())
}
return strconv.ParseInt(strings.TrimSpace(stdout.String()), 10, 64)
pid, err := strconv.ParseInt(strings.TrimSpace(stdout.String()), 10, 64)
if pid == 0 {
return 0, fmt.Errorf("failed to retrieve %s pid, container is not running", dockerName)
}
return pid, err
}

// RunDockerServer is a template for running a protocols server in a docker.
Expand Down

0 comments on commit 76302ed

Please sign in to comment.