Fixes for tests on RHEL and test log output

This commit is contained in:
Arthur Barr
2019-02-27 14:27:12 +00:00
committed by Arthur Barr
parent a194545f08
commit c441de7d26
5 changed files with 122 additions and 53 deletions

View File

@@ -46,12 +46,17 @@ func logContainerDetails() {
}
}
caps, err := containerruntime.GetCapabilities()
capLogged := false
if err == nil {
for k, v := range caps {
if len(v) > 0 {
log.Printf("Capabilities (%s set): %v", strings.ToLower(k), strings.Join(v, ","))
capLogged = true
}
}
if !capLogged {
log.Print("Capabilities: none")
}
} else {
log.Errorf("Error getting capabilities: %v", err)
}

View File

@@ -50,12 +50,19 @@ func logContainerDetails() error {
}
}
caps, err := containerruntime.GetCapabilities()
capLogged := false
if err == nil {
for k, v := range caps {
if len(v) > 0 {
log.Printf("Capabilities (%s set): %v", strings.ToLower(k), strings.Join(v, ","))
capLogged = true
}
}
if !capLogged {
log.Print("Capabilities: none")
}
} else {
log.Errorf("Error getting capabilities: %v", err)
}
sc, err := containerruntime.GetSeccomp()
if err == nil {