Repository: incubator-ranger Updated Branches: refs/heads/master 5702966e7 -> 62532a11d
RANGER-897 - Change Apache DS tests to run on a random port Signed-off-by: Alok Lal <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/62532a11 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/62532a11 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/62532a11 Branch: refs/heads/master Commit: 62532a11d4bb796d54c3efc13889c870748223dc Parents: 5702966 Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Mar 29 16:44:46 2016 +0100 Committer: Alok Lal <[email protected]> Committed: Tue Mar 29 15:21:08 2016 -0700 ---------------------------------------------------------------------- ugsync/pom.xml | 49 ++++++++++++++++++++ .../ranger/usergroupsync/LdapUserGroupTest.java | 5 +- .../src/test/resources/ranger-ugsync-site.xml | 2 +- 3 files changed, 54 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/62532a11/ugsync/pom.xml ---------------------------------------------------------------------- diff --git a/ugsync/pom.xml b/ugsync/pom.xml index db69e6c..9d8c4f0 100644 --- a/ugsync/pom.xml +++ b/ugsync/pom.xml @@ -142,4 +142,53 @@ <version>${commons.io.version}</version> </dependency> </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/ranger-ugsync-site.xml</include> + </includes> + </testResource> + <testResource> + <directory>src/test/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/ranger-ugsync-site.xml</exclude> + </excludes> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>reserve-network-port</id> + <goals> + <goal>reserve-network-port</goal> + </goals> + <phase>initialize</phase> + <configuration> + <portNames> + <portName>ldap.port</portName> + </portNames> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <systemPropertyVariables> + <ldap.port>${ldap.port}</ldap.port> + </systemPropertyVariables> + </configuration> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/62532a11/ugsync/src/test/java/org/apache/ranger/usergroupsync/LdapUserGroupTest.java ---------------------------------------------------------------------- diff --git a/ugsync/src/test/java/org/apache/ranger/usergroupsync/LdapUserGroupTest.java b/ugsync/src/test/java/org/apache/ranger/usergroupsync/LdapUserGroupTest.java index 68ddfef..8d75e10 100644 --- a/ugsync/src/test/java/org/apache/ranger/usergroupsync/LdapUserGroupTest.java +++ b/ugsync/src/test/java/org/apache/ranger/usergroupsync/LdapUserGroupTest.java @@ -35,6 +35,7 @@ import org.apache.directory.server.protocol.shared.transport.TcpTransport; import org.apache.ranger.ldapusersync.process.LdapUserGroupBuilder; import org.apache.ranger.unixusersync.config.UserGroupSyncConfig; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -82,7 +83,9 @@ public class LdapUserGroupTest extends AbstractLdapTestUnit{ LdapServer ldapServer = new LdapServer(); ldapServer.setSaslHost("127.0.0.1"); ldapServer.setSearchBaseDn("DC=ranger,DC=qe,DC=hortonworks,DC=com"); - ldapServer.setTransports(new TcpTransport("127.0.0.1", 10389)); + String ldapPort = System.getProperty("ldap.port"); + Assert.assertNotNull("Property 'ldap.port' null", ldapPort); + ldapServer.setTransports(new TcpTransport("127.0.0.1", Integer.parseInt(ldapPort))); ldapServer.setDirectoryService(getService()); ldapServer.setMaxSizeLimit( LdapServer.NO_SIZE_LIMIT ); setLdapServer(ldapServer); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/62532a11/ugsync/src/test/resources/ranger-ugsync-site.xml ---------------------------------------------------------------------- diff --git a/ugsync/src/test/resources/ranger-ugsync-site.xml b/ugsync/src/test/resources/ranger-ugsync-site.xml index 0b2c991..9ae522b 100644 --- a/ugsync/src/test/resources/ranger-ugsync-site.xml +++ b/ugsync/src/test/resources/ranger-ugsync-site.xml @@ -105,7 +105,7 @@ <property> <name>ranger.usersync.ldap.url</name> - <value>ldap://127.0.0.1:10389</value> + <value>ldap://127.0.0.1:${ldap.port}</value> </property> <property>
