prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix version handling in e2e tests

Browse Source 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
This commit is contained in:
Vishnu kannan 2016-02-03 17:32:26 -08:00
parent 3f75344053
commit f0fd525a24
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
integration/framework/framework.go
View File

@ -268,10 +268,12 @@ func (self dockerActions) Run(args DockerRunArgs, cmd ...string) string {
func (self dockerActions) Version() []string { func (self dockerActions) Version() []string {
dockerCommand := []string{"docker", "version", "-f", "'{{.Server.Version}}'"} dockerCommand := []string{"docker", "version", "-f", "'{{.Server.Version}}'"}
output, _ := self.fm.Shell().Run("sudo", dockerCommand...) output, _ := self.fm.Shell().Run("sudo", dockerCommand...)
if len(output) != 1 { output = strings.TrimSpace(output)
self.fm.T().Fatalf("need 1 arguments in output %v to get the version but have %v", output, len(output)) ret := strings.Split(output, ".")
if len(ret) != 3 {
self.fm.T().Fatalf("invalid version %v", output)
} }
return strings.Split(output, ".") return ret
} }
func (self dockerActions) StorageDriver() string { func (self dockerActions) StorageDriver() string {