Improved TestConfiguration

This commit is contained in:
Jakub Al-Khalili 2019-07-08 15:13:30 +02:00
parent 5e22cdfdce
commit 4329881788
1 changed files with 10 additions and 0 deletions

View File

@ -70,6 +70,7 @@ func TestConfiguration(t *testing.T) {
verifyJenkinsMasterPodAttributes(t, jenkins) verifyJenkinsMasterPodAttributes(t, jenkins)
client := verifyJenkinsAPIConnection(t, jenkins) client := verifyJenkinsAPIConnection(t, jenkins)
verifyPlugins(t, client, jenkins) verifyPlugins(t, client, jenkins)
verifyPodPropagation(t, jenkins)
// user // user
waitForJenkinsUserConfigurationToComplete(t, jenkins) waitForJenkinsUserConfigurationToComplete(t, jenkins)
@ -77,6 +78,15 @@ func TestConfiguration(t *testing.T) {
verifyJenkinsSeedJobs(t, client, []seedJobConfig{mySeedJob}) verifyJenkinsSeedJobs(t, client, []seedJobConfig{mySeedJob})
} }
func verifyPodPropagation(t *testing.T, jenkins *v1alpha2.Jenkins) {
jenkinsPod := getJenkinsMasterPod(t, jenkins)
jenkins = getJenkins(t, jenkins.Namespace, jenkins.Name)
assert.Equal(t, jenkins.Spec.Master.SecurityContext, jenkinsPod.Spec.SecurityContext)
assert.Equal(t, jenkins.Spec.Master.Containers[0].Command, jenkinsPod.Spec.Containers[0].Command)
}
func createUserConfigurationSecret(t *testing.T, namespace string, systemMessageEnvName, systemMessage string) { func createUserConfigurationSecret(t *testing.T, namespace string, systemMessageEnvName, systemMessage string) {
userConfiguration := &corev1.Secret{ userConfiguration := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{