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

Windows: Require REST 1.25 or later

Browse Source 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f811d5b1288583b4bb4b978e58ca0466236a9a30
Component: engine
This commit is contained in:
John Howard
2016-10-31 10:15:43 -07:00
parent d674b1fc4d
commit b55dfc1ac1
10 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/engine/integration-cli/docker_api_stats_test.go
View File

@ -162,20 +162,15 @@ func (s *DockerSuite) TestAPIStatsNetworkStats(c *check.C) {
}
func (s *DockerSuite) TestAPIStatsNetworkStatsVersioning(c *check.C) {
testRequires(c, SameHostDaemon)
// Windows doesn't support API versions less than 1.25, so no point testing 1.17 .. 1.21
testRequires(c, SameHostDaemon, DaemonIsLinux)
out, _ := runSleepingContainer(c)
id := strings.TrimSpace(out)
c.Assert(waitRun(id), checker.IsNil)
wg := sync.WaitGroup{}
// Windows API versions prior to 1.21 doesn't support stats.
startAt := 17
if daemonPlatform == "windows" {
startAt = 21
}
for i := startAt; i <= 21; i++ {
for i := 17; i <= 21; i++ {
wg.Add(1)
go func(i int) {
defer wg.Done()