Skip to content

Commit

Permalink
Fix extended tests: Docker 17.03 is newer than 1.9
Browse files Browse the repository at this point in the history
Signed-off-by: Oleg Bulatov <[email protected]>
  • Loading branch information
Oleg Bulatov committed Aug 1, 2017
1 parent c9479ed commit 176ce90
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/extended/images/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ func calculateRoughDataSize(logger io.Writer, wantedImageSize uint64, numberOfLa
// TODO(miminar): shall we use some better logging mechanism?
logger.Write([]byte(fmt.Sprintf("Failed to get docker version: %v\n", err)))
}
if (major >= 1 && minor >= 9) || version == "" {
if major >= 1 || major == 1 && minor >= 9 || version == "" {
// running Docker version 1.9+
return uint64(float64(wantedImageSize) / (float64(numberOfLayers) * layerSizeMultiplierForLatestDocker))
}
Expand Down

0 comments on commit 176ce90

Please sign in to comment.