Juan Hernandez has uploaded a new change for review. Change subject: core: Run tests without data source location retry ......................................................................
core: Run tests without data source location retry Since commit fd6835 the application retries the location of the data source, this means that some tests will take a long time to run because the data source is never deployed in the testing environment. To prevent that this change adds configuration parameters to run those tests with an alternative configuration that disables the retry. Change-Id: I8583da699ae46ce571bb96aa79809031d8d54990 Signed-off-by: Juan Hernandez <[email protected]> --- M backend/manager/modules/bll/pom.xml A backend/manager/modules/bll/src/test/resources/engine.conf A backend/manager/modules/bll/src/test/resources/engine.conf.defaults 3 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/13782/1 diff --git a/backend/manager/modules/bll/pom.xml b/backend/manager/modules/bll/pom.xml index f21118d..20c92f5 100644 --- a/backend/manager/modules/bll/pom.xml +++ b/backend/manager/modules/bll/pom.xml @@ -170,6 +170,16 @@ <value>${engine.schema}</value> </property> </systemProperties> + + <!-- These environment variables are needed to run the tests + using an alternative configuration that disables retries + when trying to locate the data source, otherwise each + test will have to wait till the timeout expires: --> + <environmentVariables> + <ENGINE_DEFAULTS>${basedir}/src/test/resources/engine.conf.defaults</ENGINE_DEFAULTS> + <ENGINE_VARS>${basedir}/src/test/resources/engine.conf</ENGINE_VARS> + </environmentVariables> + <argLine>-Dengine.ejb3.connector.port=${engine.ejb3.connector.port} -Dengine.bisocket.connector.port=${engine.bisocket.connector.port} -Dsun.lang.ClassLoader.allowArraySyntax=true -Djava.endorsed.dirs="${settings.localRepository}/org/codehaus/woodstox/wstx-asl/3.2.9/"</argLine> <additionalClasspathElements> <additionalClasspathElement>${basedir}/src/test/java</additionalClasspathElement> diff --git a/backend/manager/modules/bll/src/test/resources/engine.conf b/backend/manager/modules/bll/src/test/resources/engine.conf new file mode 100644 index 0000000..816daef --- /dev/null +++ b/backend/manager/modules/bll/src/test/resources/engine.conf @@ -0,0 +1 @@ +# Empty on purpose. diff --git a/backend/manager/modules/bll/src/test/resources/engine.conf.defaults b/backend/manager/modules/bll/src/test/resources/engine.conf.defaults new file mode 100644 index 0000000..25fd5ae --- /dev/null +++ b/backend/manager/modules/bll/src/test/resources/engine.conf.defaults @@ -0,0 +1,3 @@ +# Reduce the database connection timeouts so we fail inmediately: +ENGINE_DB_CONNECTION_TIMEOUT=0 +ENGINE_DB_CHECK_INTERVAL=0 -- To view, visit http://gerrit.ovirt.org/13782 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8583da699ae46ce571bb96aa79809031d8d54990 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
