Need to use the TestNG version 5.0 to fix a bug in the Integration Tests wh...

el_kaboing

11.33.2006 4b70d7120a4403b9778d94a8aa42f5a55cf53f67

Need to use the TestNG version 5.0 to fix a bug in the Integration Tests where the test suite would hang when making the reports when there were FAILS. Note that there are now two versions of TestNG as the unit tests are still using TestNG version 4.7. When the unit tests switch to version 5.0, we can go back to one version TestNG version again.

 opends/tests/integration-tests-testng/build.sh

@@ -63,9 +63,9 @@

# Make sure that the TestNG JAR file is in the CLASSPATH so that ant will be
# able to find it.
testng_jar=${ds_home}/ext/testng/lib/testng-4.7-jdk15.jar
testng_jar=${ds_home}/tests/integration-tests-testng/ext/testng/lib/testng-5.0.2-jdk15.jar
if [ -f "${testng_jar}" ]; then
    CLASSPATH="${ds_home}/ext/testng/lib/testng-4.7-jdk15.jar"
    CLASSPATH="${ds_home}/tests/integration-tests-testng/ext/testng/lib/testng-5.0.2-jdk15.jar"
    export CLASSPATH
else
    die 11 "Could not find junit library in ${ds_home}/ext/testng/lib"
@@ -135,7 +135,7 @@
OPENDS_HOME=\${1}
cd \${OPENDS_HOME}
echo "OpenDS Integration Tests have started........."
CLASSPATH="${ds_home}/ext/testng/lib/testng-4.7-jdk15.jar:${ds_home}/build/integration-tests:\${OPENDS_HOME}/lib/OpenDS.jar:\${OPENDS_HOME}/lib/je.jar"
CLASSPATH="${ds_home}/tests/integration-tests-testng/ext/testng/lib/testng-5.0.2-jdk15.jar:${ds_home}/build/integration-tests:\${OPENDS_HOME}/lib/OpenDS.jar:\${OPENDS_HOME}/lib/je.jar"
java -ea -cp \${CLASSPATH} org.testng.TestNG -d /tmp/testng -listener org.opends.server.OpenDSTestListener ${ft_home}/ext/testng/testng.xml
else
OPENDS_INSTALL_DIR=\${2}
@@ -259,7 +259,7 @@
sleep 30

echo "OpenDS Integration Tests have started........."
CLASSPATH="${ds_home}/ext/testng/lib/testng-4.7-jdk15.jar:${ds_home}/build/integration-tests:\${OPENDS_HOME}/lib/OpenDS.jar:\${OPENDS_HOME}/lib/je.jar"
CLASSPATH="${ds_home}/tests/integration-tests-testng/ext/testng/lib/testng-5.0.2-jdk15.jar:${ds_home}/build/integration-tests:\${OPENDS_HOME}/lib/OpenDS.jar:\${OPENDS_HOME}/lib/je.jar"
java -ea -cp \${CLASSPATH} org.testng.TestNG -d /tmp/testng -listener org.opends.server.OpenDSTestListener ${ft_home}/ext/testng/testng.xml

echo "The output from OpenDS is in \${INTEG_TEST_DIR}/opends/logs"

 opends/tests/integration-tests-testng/ext/testng/lib/testng-5.0.2-jdk15.jar

Binary files differ