academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only use coverage options when necessary

Browse Source
This commit is contained in:
arthur.barr@uk.ibm.com
2023-06-01 14:41:24 +01:00
committed by Arthur Barr
parent 1f7334e3d1
commit 05fe51d96d
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
test/container/docker_api_test_util.go
View File

@@ -244,15 +244,15 @@ func generateRandomUID() string {
// getDefaultHostConfig creates a HostConfig and populates it with the defaults used in testing // getDefaultHostConfig creates a HostConfig and populates it with the defaults used in testing
func getDefaultHostConfig(t *testing.T, cli ce.ContainerInterface) *ce.ContainerHostConfig { func getDefaultHostConfig(t *testing.T, cli ce.ContainerInterface) *ce.ContainerHostConfig {
hostConfig := ce.ContainerHostConfig{ hostConfig := ce.ContainerHostConfig{
Binds: []string{
coverageBind(t),
},
PortBindings: []ce.PortBinding{}, PortBindings: []ce.PortBinding{},
CapDrop: []string{ CapDrop: []string{
"ALL", "ALL",
}, },
Privileged: false, Privileged: false,
} }
if coverage() {
hostConfig.Binds = append(hostConfig.Binds, coverageBind(t))
}
if devImage(t, cli) { if devImage(t, cli) {
// Only needed for a RHEL-based image // Only needed for a RHEL-based image
if baseImage(t, cli) != "ubuntu" { if baseImage(t, cli) != "ubuntu" {
@@ -274,9 +274,10 @@ func runContainerWithHostConfig(t *testing.T, cli ce.ContainerInterface, contain
if containerConfig.User == "" { if containerConfig.User == "" {
containerConfig.User = generateRandomUID() containerConfig.User = generateRandomUID()
} }
// if coverage if coverage() {
containerConfig.Env = append(containerConfig.Env, "COVERAGE_FILE="+t.Name()+".cov") containerConfig.Env = append(containerConfig.Env, "COVERAGE_FILE="+t.Name()+".cov")
containerConfig.Env = append(containerConfig.Env, "EXIT_CODE_FILE="+getExitCodeFilename(t)) containerConfig.Env = append(containerConfig.Env, "EXIT_CODE_FILE="+getExitCodeFilename(t))
}
networkingConfig := ce.ContainerNetworkSettings{} networkingConfig := ce.ContainerNetworkSettings{}
t.Logf("Running container (%s)", containerConfig.Image) t.Logf("Running container (%s)", containerConfig.Image)
ID, err := cli.ContainerCreate(containerConfig, hostConfig, &networkingConfig, t.Name()) ID, err := cli.ContainerCreate(containerConfig, hostConfig, &networkingConfig, t.Name())
@@ -300,9 +301,10 @@ func runContainerWithAllConfig(t *testing.T, cli ce.ContainerInterface, containe
if containerConfig.User == "" { if containerConfig.User == "" {
containerConfig.User = generateRandomUID() containerConfig.User = generateRandomUID()
} }
// if coverage if coverage() {
containerConfig.Env = append(containerConfig.Env, "COVERAGE_FILE="+t.Name()+".cov") containerConfig.Env = append(containerConfig.Env, "COVERAGE_FILE="+t.Name()+".cov")
containerConfig.Env = append(containerConfig.Env, "EXIT_CODE_FILE="+getExitCodeFilename(t)) containerConfig.Env = append(containerConfig.Env, "EXIT_CODE_FILE="+getExitCodeFilename(t))
}
t.Logf("Running container (%s)", containerConfig.Image) t.Logf("Running container (%s)", containerConfig.Image)
ID, err := cli.ContainerCreate(containerConfig, hostConfig, networkingConfig, containerName) ID, err := cli.ContainerCreate(containerConfig, hostConfig, networkingConfig, containerName)
if err != nil { if err != nil {
@@ -432,14 +434,12 @@ func getHostConfig(t *testing.T, mounts int, qmsharedlogs string, qmshareddata s
case 1: case 1:
hostConfig = ce.ContainerHostConfig{ hostConfig = ce.ContainerHostConfig{
Binds: []string{ Binds: []string{
coverageBind(t),
qmdata + ":/mnt/mqm", qmdata + ":/mnt/mqm",
}, },
} }
case 2: case 2:
hostConfig = ce.ContainerHostConfig{ hostConfig = ce.ContainerHostConfig{
Binds: []string{ Binds: []string{
coverageBind(t),
qmdata + ":/mnt/mqm", qmdata + ":/mnt/mqm",
qmshareddata + ":/mnt/mqm-data", qmshareddata + ":/mnt/mqm-data",
}, },
@@ -447,7 +447,6 @@ func getHostConfig(t *testing.T, mounts int, qmsharedlogs string, qmshareddata s
case 3: case 3:
hostConfig = ce.ContainerHostConfig{ hostConfig = ce.ContainerHostConfig{
Binds: []string{ Binds: []string{
coverageBind(t),
qmdata + ":/mnt/mqm", qmdata + ":/mnt/mqm",
qmsharedlogs + ":/mnt/mqm-log", qmsharedlogs + ":/mnt/mqm-log",
}, },
@@ -455,14 +454,15 @@ func getHostConfig(t *testing.T, mounts int, qmsharedlogs string, qmshareddata s
case 4: case 4:
hostConfig = ce.ContainerHostConfig{ hostConfig = ce.ContainerHostConfig{
Binds: []string{ Binds: []string{
coverageBind(t),
qmdata + ":/mnt/mqm", qmdata + ":/mnt/mqm",
qmsharedlogs + ":/mnt/mqm-log", qmsharedlogs + ":/mnt/mqm-log",
qmshareddata + ":/mnt/mqm-data", qmshareddata + ":/mnt/mqm-data",
}, },
} }
} }
if coverage() {
hostConfig.Binds = append(hostConfig.Binds, coverageBind(t))
}
return hostConfig return hostConfig
} }
@@ -625,7 +625,7 @@ func inspectTextLogs(t *testing.T, cli ce.ContainerInterface, ID string) string
if strings.HasPrefix(text, "{") { if strings.HasPrefix(text, "{") {
var e map[string]interface{} var e map[string]interface{}
json.Unmarshal([]byte(text), &e) json.Unmarshal([]byte(text), &e)
fmt.Fprintf(buf, "{\"message\": \"%v\"}\n", e["message"]) fmt.Fprintf(buf, "{\"message\": \"%v\", ...}\n", e["message"])
} else { } else {
fmt.Fprintln(buf, text) fmt.Fprintln(buf, text)
} }
@@ -790,9 +790,10 @@ func runContainerWithAllConfigError(t *testing.T, cli ce.ContainerInterface, con
if containerConfig.User == "" { if containerConfig.User == "" {
containerConfig.User = generateRandomUID() containerConfig.User = generateRandomUID()
} }
// if coverage if coverage() {
containerConfig.Env = append(containerConfig.Env, "COVERAGE_FILE="+t.Name()+".cov") containerConfig.Env = append(containerConfig.Env, "COVERAGE_FILE="+t.Name()+".cov")
containerConfig.Env = append(containerConfig.Env, "EXIT_CODE_FILE="+getExitCodeFilename(t)) containerConfig.Env = append(containerConfig.Env, "EXIT_CODE_FILE="+getExitCodeFilename(t))
}
t.Logf("Running container (%s)", containerConfig.Image) t.Logf("Running container (%s)", containerConfig.Image)
ID, err := cli.ContainerCreate(containerConfig, hostConfig, networkingConfig, containerName) ID, err := cli.ContainerCreate(containerConfig, hostConfig, networkingConfig, containerName)
if err != nil { if err != nil {