public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

#28 Fix e2e test

This commit is contained in:
Tomasz Sęk 2019-09-04 11:27:36 +02:00
parent 0730a2fabc
commit dc86778d67
No known key found for this signature in database
GPG Key ID: DC356D23F6A644D0
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/restart_test.go
View File

@ -28,7 +28,6 @@ func TestJenkinsMasterPodRestart(t *testing.T) {
waitForJenkinsBaseConfigurationToComplete(t, jenkins) waitForJenkinsBaseConfigurationToComplete(t, jenkins)
} }
// FIXME java.lang.Exception: AuthorizationStrategy.Unsecured is not set
func TestSafeRestart(t *testing.T) { func TestSafeRestart(t *testing.T) {
t.Parallel() t.Parallel()
namespace, ctx := setupTest(t) namespace, ctx := setupTest(t)
@ -36,8 +35,17 @@ func TestSafeRestart(t *testing.T) {
defer ctx.Cleanup() defer ctx.Cleanup()
jenkinsCRName := "e2e" jenkinsCRName := "e2e"
configureAuthorizationToUnSecure(t, namespace) configureAuthorizationToUnSecure(t, namespace, userConfigurationConfigMapName)
jenkins := createJenkinsCR(t, jenkinsCRName, namespace, nil, v1alpha2.GroovyScripts{}, v1alpha2.ConfigurationAsCode{}) groovyScriptsConfig := v1alpha2.GroovyScripts{
Customization: v1alpha2.Customization{
Configurations: []v1alpha2.ConfigMapRef{
{
Name: userConfigurationConfigMapName,
},
},
},
}
jenkins := createJenkinsCR(t, jenkinsCRName, namespace, nil, groovyScriptsConfig, v1alpha2.ConfigurationAsCode{})
waitForJenkinsBaseConfigurationToComplete(t, jenkins) waitForJenkinsBaseConfigurationToComplete(t, jenkins)
waitForJenkinsUserConfigurationToComplete(t, jenkins) waitForJenkinsUserConfigurationToComplete(t, jenkins)
jenkinsClient := verifyJenkinsAPIConnection(t, jenkins) jenkinsClient := verifyJenkinsAPIConnection(t, jenkins)
@ -50,10 +58,10 @@ func TestSafeRestart(t *testing.T) {
checkIfAuthorizationStrategyUnsecuredIsSet(t, jenkinsClient) checkIfAuthorizationStrategyUnsecuredIsSet(t, jenkinsClient)
} }
func configureAuthorizationToUnSecure(t *testing.T, namespace string) { func configureAuthorizationToUnSecure(t *testing.T, namespace, configMapName string) {
limitRange := &corev1.ConfigMap{ limitRange := &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: userConfigurationConfigMapName, Name: configMapName,
Namespace: namespace, Namespace: namespace,
}, },
Data: map[string]string{ Data: map[string]string{