You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2021/06/14 19:58:35 UTC
[directory-studio] branch kerby-gssapi-tests updated: Fix
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a commit to branch kerby-gssapi-tests
in repository https://gitbox.apache.org/repos/asf/directory-studio.git
The following commit(s) were added to refs/heads/kerby-gssapi-tests by this push:
new d70295a Fix
d70295a is described below
commit d70295a23366c0a32851102a6815c780452b3e53
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Mon Jun 14 21:58:19 2021 +0200
Fix
---
Jenkinsfile | 2 +-
.../directory/studio/test/integration/ui/NewConnectionWizardTest.java | 2 +-
tools/testlab/krb5.conf | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 602d1e6..a035b41 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -136,7 +136,7 @@ def inTestLab(Closure action){
docker.image('coheigea/kerby').withRun('-h kerby.example.com -v $(pwd)/tools/testlab/kerby-data:/kerby-data') { kerby ->
docker.image('osixia/openldap:1.5.0').withRun('-h openldap.example.com -v $(pwd)/tools/testlab/ldap.keytab:/etc/krb5.keytab -v $(pwd)/tools/testlab/krb5.conf:/etc/krb5.conf -e LDAP_TLS_VERIFY_CLIENT=never') { openldap ->
docker.image('389ds/dirsrv').withRun('-h fedora389ds.example.com -v $(pwd)/tools/testlab/ldap.keytab:/etc/krb5.keytab -v $(pwd)/tools/testlab/krb5.conf:/etc/krb5.conf -e DS_DM_PASSWORD=admin', 'bash -c "zypper install -y cyrus-sasl-crammd5 cyrus-sasl-digestmd5 cyrus-sasl-gssapi; set -m; /usr/lib/dirsrv/dscontainer -r & while ! /usr/lib/dirsrv/dscontainer -H; do sleep 5; done; sleep 5; /usr/sbin/dsconf localhost backend create --suffix dc=example,dc=org --be-name example; fg"') { fe [...]
- docker.image('apachedirectory/maven-build:jdk-8').inside("--link=${kerby.id}:kerby.example.com --link=${openldap.id}:openldap.example.com -v ${pwd}/tools/testlab/krb5.conf:/etc/krb5.conf -e OPENLDAP_HOST=openldap -e OPENLDAP_PORT=389 -e OPENLDAP_PORT_SSL=636 --link=${fedora389ds.id}:fedora389ds.example.com -e FEDORA_389DS_HOST=fedora389ds -e FEDORA_389DS_PORT=3389 -e FEDORA_389DS_PORT_SSL=3636") {
+ docker.image('apachedirectory/maven-build:jdk-8').inside('-v ${env.WORKSPACE}/tools/testlab/krb5.conf:/etc/krb5.conf --link=${kerby.id}:kerby.example.com --link=${openldap.id}:openldap.example.com -e OPENLDAP_HOST=openldap -e OPENLDAP_PORT=389 -e OPENLDAP_PORT_SSL=636 --link=${fedora389ds.id}:fedora389ds.example.com -e FEDORA_389DS_HOST=fedora389ds -e FEDORA_389DS_PORT=3389 -e FEDORA_389DS_PORT_SSL=3636') {
action()
}
}
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java
index fba86f3..4b8a74e 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java
@@ -531,7 +531,7 @@ public class NewConnectionWizardTest extends AbstractTestBase
wizardBot.selectProtectionStrength( SaslSecurityStrength.HIGH );
wizardBot.selectUseManualConfiguration();
wizardBot.typeKerberosRealm( "EXAMPLE.COM" );
- wizardBot.typeKdcHost( LOCALHOST );
+ wizardBot.typeKdcHost( "kerby.example.com" );
wizardBot.typeKdcPort( 60088 );
String result = wizardBot.clickCheckAuthenticationButton();
diff --git a/tools/testlab/krb5.conf b/tools/testlab/krb5.conf
index cb007b8..b6f9369 100644
--- a/tools/testlab/krb5.conf
+++ b/tools/testlab/krb5.conf
@@ -19,11 +19,11 @@
[libdefaults]
kdc_realm = EXAMPLE.COM
default_realm = EXAMPLE.COM
- udp_preference_limit = 4096
+ udp_preference_limit = 1
kdc_tcp_port = 60088
kdc_udp_port = 60088
[realms]
EXAMPLE.COM = {
kdc = kerby.example.com:60088
- }
\ No newline at end of file
+ }