mirror of
https://github.com/clearlinux/docker.git
synced 2026-11-20 04:42:56 +00:00
Fixes 2 panics initialising tests
Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
@@ -502,10 +502,9 @@ func init() {
|
|||||||
// Obtain the daemon platform so that it can be used by tests to make
|
// Obtain the daemon platform so that it can be used by tests to make
|
||||||
// intelligent decisions about how to configure themselves, and validate
|
// intelligent decisions about how to configure themselves, and validate
|
||||||
// that the target platform is valid.
|
// that the target platform is valid.
|
||||||
res, b, err := sockRequestRaw("GET", "/version", nil, "application/json")
|
res, _, err := sockRequestRaw("GET", "/version", nil, "application/json")
|
||||||
defer b.Close()
|
if err != nil || res == nil || (res != nil && res.StatusCode != http.StatusOK) {
|
||||||
if err != nil || res.StatusCode != http.StatusOK {
|
panic(fmt.Errorf("Init failed to get version: %v. Res=%v", err.Error(), res))
|
||||||
panic("Init failed to get version: " + err.Error() + " " + string(res.StatusCode))
|
|
||||||
}
|
}
|
||||||
svrHeader, _ := httputils.ParseServerHeader(res.Header.Get("Server"))
|
svrHeader, _ := httputils.ParseServerHeader(res.Header.Get("Server"))
|
||||||
daemonPlatform = svrHeader.OS
|
daemonPlatform = svrHeader.OS
|
||||||
|
|||||||
Reference in New Issue
Block a user