docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22916 from duglin/FixNetTest 

Fix flaky TestApiStatsNetworkStats test
This commit is contained in:
Vincent Demeester 2016-05-25 18:51:47 +02:00
parent c7ee503082 94d0571304
commit 004ce6b571
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
integration-cli/docker_api_stats_test.go
View File

@ -107,9 +107,22 @@ func (s *DockerSuite) TestApiStatsNetworkStats(c *check.C) {
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
countParam = "-n" // Ping count parameter is -n on Windows countParam = "-n" // Ping count parameter is -n on Windows
} }
pingout, err := exec.Command("ping", contIP, countParam, strconv.Itoa(numPings)).Output() pingout, err := exec.Command("ping", contIP, countParam, strconv.Itoa(numPings)).CombinedOutput()
pingouts := string(pingout[:]) if err != nil && runtime.GOOS == "linux" {
// If it fails then try a work-around, but just for linux.
// If this fails too then go back to the old error for reporting.
//
// The ping will sometimes fail due to an apparmor issue where it
// denies access to the libc.so.6 shared library - running it
// via /lib64/ld-linux-x86-64.so.2 seems to work around it.
pingout2, err2 := exec.Command("/lib64/ld-linux-x86-64.so.2", "/bin/ping", contIP, "-c", strconv.Itoa(numPings)).CombinedOutput()
if err2 == nil {
pingout = pingout2
err = err2
}
}
c.Assert(err, checker.IsNil) c.Assert(err, checker.IsNil)
pingouts := string(pingout[:])
nwStatsPost := getNetworkStats(c, id) nwStatsPost := getNetworkStats(c, id)
for _, v := range nwStatsPost { for _, v := range nwStatsPost {
postRxPackets += v.RxPackets postRxPackets += v.RxPackets