Fix extended tests: Docker 17.03 is newer than 1.9

Oleg Bulatov · Oleg Bulatov · commit 176ce9049a45 · 2017-08-01T16:39:13.000+02:00
Signed-off-by: Oleg Bulatov &lt;obulatov@redhat.com&gt;
diff --git a/test/extended/images/helper.go b/test/extended/images/helper.go
@@ -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))
 	}

Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ func calculateRoughDataSize(logger io.Writer, wantedImageSize uint64, numberOfLa`
`493`	`493`	`// TODO(miminar): shall we use some better logging mechanism?`
`494`	`494`	`logger.Write([]byte(fmt.Sprintf("Failed to get docker version: %v\n", err)))`
`495`	`495`	`}`
`496`		`- if (major >= 1 && minor >= 9) \|\| version == "" {`
	`496`	`+ if major >= 1 \|\| major == 1 && minor >= 9 \|\| version == "" {`
`497`	`497`	`// running Docker version 1.9+`
`498`	`498`	`return uint64(float64(wantedImageSize) / (float64(numberOfLayers) * layerSizeMultiplierForLatestDocker))`
`499`	`499`	`}`