kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Windows: Turn off stats

Browse source 
Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard 2016-02-02 17:59:11 -08:00
parent c2bf90eb59
commit 55268f4e91
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/stats.go
View file

@ -2,7 +2,9 @@ package daemon
import ( import (
"encoding/json" "encoding/json"
"errors"
"io" "io"
"runtime"
"github.com/docker/docker/daemon/execdriver" "github.com/docker/docker/daemon/execdriver"
"github.com/docker/docker/pkg/version" "github.com/docker/docker/pkg/version"
@ -22,6 +24,10 @@ type ContainerStatsConfig struct {
// ContainerStats writes information about the container to the stream // ContainerStats writes information about the container to the stream
// given in the config object. // given in the config object.
func (daemon *Daemon) ContainerStats(prefixOrName string, config *ContainerStatsConfig) error { func (daemon *Daemon) ContainerStats(prefixOrName string, config *ContainerStatsConfig) error {
if runtime.GOOS == "windows" {
return errors.New("Windows does not support stats")
}
container, err := daemon.GetContainer(prefixOrName) container, err := daemon.GetContainer(prefixOrName)
if err != nil { if err != nil {
return err return err

5
integration-cli/docker_cli_stats_test.go
View file

@ -12,6 +12,7 @@ import (
) )
func (s *DockerSuite) TestStatsNoStream(c *check.C) { func (s *DockerSuite) TestStatsNoStream(c *check.C) {
// Windows does not support stats
testRequires(c, DaemonIsLinux) testRequires(c, DaemonIsLinux)
out, _ := dockerCmd(c, "run", "-d", "busybox", "top") out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
id := strings.TrimSpace(out) id := strings.TrimSpace(out)
@ -40,6 +41,7 @@ func (s *DockerSuite) TestStatsNoStream(c *check.C) {
} }
func (s *DockerSuite) TestStatsContainerNotFound(c *check.C) { func (s *DockerSuite) TestStatsContainerNotFound(c *check.C) {
// Windows does not support stats
testRequires(c, DaemonIsLinux) testRequires(c, DaemonIsLinux)
out, _, err := dockerCmdWithError("stats", "notfound") out, _, err := dockerCmdWithError("stats", "notfound")
@ -52,6 +54,7 @@ func (s *DockerSuite) TestStatsContainerNotFound(c *check.C) {
} }
func (s *DockerSuite) TestStatsAllRunningNoStream(c *check.C) { func (s *DockerSuite) TestStatsAllRunningNoStream(c *check.C) {
// Windows does not support stats
testRequires(c, DaemonIsLinux) testRequires(c, DaemonIsLinux)
out, _ := dockerCmd(c, "run", "-d", "busybox", "top") out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
@ -75,6 +78,7 @@ func (s *DockerSuite) TestStatsAllRunningNoStream(c *check.C) {
} }
func (s *DockerSuite) TestStatsAllNoStream(c *check.C) { func (s *DockerSuite) TestStatsAllNoStream(c *check.C) {
// Windows does not support stats
testRequires(c, DaemonIsLinux) testRequires(c, DaemonIsLinux)
out, _ := dockerCmd(c, "run", "-d", "busybox", "top") out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
@ -92,6 +96,7 @@ func (s *DockerSuite) TestStatsAllNoStream(c *check.C) {
} }
func (s *DockerSuite) TestStatsAllNewContainersAdded(c *check.C) { func (s *DockerSuite) TestStatsAllNewContainersAdded(c *check.C) {
// Windows does not support stats
testRequires(c, DaemonIsLinux) testRequires(c, DaemonIsLinux)
id := make(chan string) id := make(chan string)