p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #16065 from Microsoft/10662-fix2panics

Browse Source 
Fixes 2 panics initialising tests
Upstream-commit: 6b14d9a64576197901c9a498caef3cc6f7f3bc43
Component: engine
This commit is contained in:
Jessie Frazelle
2015-09-04 11:07:17 -07:00
parent 4ec4a9a12d 1c8b6d6152
commit 4792ea30e7
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/engine/integration-cli/docker_utils.go
View File

@ -502,10 +502,9 @@ func init() {
// Obtain the daemon platform so that it can be used by tests to make
// intelligent decisions about how to configure themselves, and validate
// that the target platform is valid.
res, b, err := sockRequestRaw("GET", "/version", nil, "application/json")
defer b.Close()
if err != nil || res.StatusCode != http.StatusOK {
panic("Init failed to get version: " + err.Error() + " " + string(res.StatusCode))
res, _, err := sockRequestRaw("GET", "/version", nil, "application/json")
if err != nil || res == nil || (res != nil && res.StatusCode != http.StatusOK) {
panic(fmt.Errorf("Init failed to get version: %v. Res=%v", err.Error(), res))
}
svrHeader, _ := httputils.ParseServerHeader(res.Header.Get("Server"))
daemonPlatform = svrHeader.OS