Skip to content

Add unit tests for PushSecretName #1466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-bot merged 1 commit into from
Mar 26, 2015
Merged

Add unit tests for PushSecretName #1466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions pkg/build/controller/strategy/custom_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,18 @@ func TestCustomCreateBuildPod(t *testing.T) {
if actual.Spec.RestartPolicy != kapi.RestartPolicyNever {
t.Errorf("Expected never, got %#v", actual.Spec.RestartPolicy)
}
if len(container.VolumeMounts) != 2 {
t.Fatalf("Expected 2 volumes in container, got %d", len(container.VolumeMounts))
}
if container.VolumeMounts[0].MountPath != dockerSocketPath {
t.Fatalf("Expected %s in first VolumeMount, got %s", dockerSocketPath, container.VolumeMounts[0].MountPath)
}
if container.VolumeMounts[1].MountPath != dockerPushSecretMountPath {
t.Fatalf("Expected %s in first VolumeMount, got %s", dockerPushSecretMountPath, container.VolumeMounts[1].MountPath)
}
if len(actual.Spec.Volumes) != 2 {
t.Fatalf("Expected 2 volumes in Build pod, got %d", len(actual.Spec.Volumes))
}
buildJSON, _ := v1beta1.Codec.Encode(expected)
errorCases := map[int][]string{
0: {"BUILD", string(buildJSON)},
Expand Down Expand Up @@ -95,6 +107,7 @@ func mockCustomBuild() *buildapi.Build {
},
Output: buildapi.BuildOutput{
DockerImageReference: "docker-registry/repository/customBuild",
PushSecretName: "foo",
},
},
Status: buildapi.BuildStatusNew,
Expand Down
17 changes: 15 additions & 2 deletions pkg/build/controller/strategy/docker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,20 @@ func TestDockerCreateBuildPod(t *testing.T) {
if actual.Spec.RestartPolicy != kapi.RestartPolicyNever {
t.Errorf("Expected never, got %#v", actual.Spec.RestartPolicy)
}
if len(container.Env) != 1 {
t.Fatalf("Expected 1 element in Env table, got %d", len(container.Env))
if len(container.VolumeMounts) != 2 {
t.Fatalf("Expected 2 volumes in container, got %d", len(container.VolumeMounts))
}
if container.VolumeMounts[0].MountPath != dockerSocketPath {
t.Fatalf("Expected %s in first VolumeMount, got %s", dockerSocketPath, container.VolumeMounts[0].MountPath)
}
if container.VolumeMounts[1].MountPath != dockerPushSecretMountPath {
t.Fatalf("Expected %s in first VolumeMount, got %s", dockerPushSecretMountPath, container.VolumeMounts[1].MountPath)
}
if len(actual.Spec.Volumes) != 2 {
t.Fatalf("Expected 2 volumes in Build pod, got %d", len(actual.Spec.Volumes))
}
if len(container.Env) != 3 {
t.Fatalf("Expected 3 elements in Env table, got %d", len(container.Env))
}
buildJSON, _ := v1beta1.Codec.Encode(expected)
errorCases := map[int][]string{
Expand Down Expand Up @@ -73,6 +85,7 @@ func mockDockerBuild() *buildapi.Build {
},
Output: buildapi.BuildOutput{
DockerImageReference: "docker-registry/repository/dockerBuild",
PushSecretName: "foo",
},
},
Status: buildapi.BuildStatusNew,
Expand Down
17 changes: 15 additions & 2 deletions pkg/build/controller/strategy/sti_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,20 @@ func TestSTICreateBuildPod(t *testing.T) {
if actual.Spec.RestartPolicy != kapi.RestartPolicyNever {
t.Errorf("Expected never, got %#v", actual.Spec.RestartPolicy)
}
if len(container.Env) != 4 {
t.Fatalf("Expected 4 elements in Env table, got %d", len(container.Env))
if len(container.Env) != 6 {
t.Fatalf("Expected 6 elements in Env table, got %d", len(container.Env))
}
if len(container.VolumeMounts) != 2 {
t.Fatalf("Expected 2 volumes in container, got %d", len(container.VolumeMounts))
}
if container.VolumeMounts[0].MountPath != dockerSocketPath {
t.Fatalf("Expected %s in first VolumeMount, got %s", dockerSocketPath, container.VolumeMounts[0].MountPath)
}
if container.VolumeMounts[1].MountPath != dockerPushSecretMountPath {
t.Fatalf("Expected %s in first VolumeMount, got %s", dockerPushSecretMountPath, container.VolumeMounts[1].MountPath)
}
if len(actual.Spec.Volumes) != 2 {
t.Fatalf("Expected 2 volumes in Build pod, got %d", len(actual.Spec.Volumes))
}
found := false
for _, v := range container.Env {
Expand Down Expand Up @@ -93,6 +105,7 @@ func mockSTIBuild() *buildapi.Build {
},
Output: buildapi.BuildOutput{
DockerImageReference: "docker-registry/repository/stiBuild",
PushSecretName: "foo",
},
},
Status: buildapi.BuildStatusNew,
Expand Down