Repository: ignite Updated Branches: refs/heads/ignite-1537 7661cc9e8 -> 0bb3f05bd
ignite-1.5 Fixed test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0bb3f05b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0bb3f05b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0bb3f05b Branch: refs/heads/ignite-1537 Commit: 0bb3f05bd1cefa88636f3086f2f050beb265b0a8 Parents: 7661cc9 Author: sboikov <sboi...@gridgain.com> Authored: Thu Dec 24 14:31:45 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Dec 24 14:31:45 2015 +0300 ---------------------------------------------------------------------- .../GridUriDeploymentFileProcessorSelfTest.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bb3f05b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java index b87551d..cbcac9c 100644 --- a/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java +++ b/modules/urideploy/src/test/java/org/apache/ignite/spi/deployment/uri/GridUriDeploymentFileProcessorSelfTest.java @@ -20,7 +20,11 @@ package org.apache.ignite.spi.deployment.uri; import java.io.File; import java.util.ArrayList; import java.util.List; +import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.internal.util.lang.GridAbsPredicate; +import org.apache.ignite.internal.util.lang.GridAbsPredicateX; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.config.GridTestProperties; import org.apache.ignite.testframework.junits.spi.GridSpiTest; import org.apache.ignite.testframework.junits.spi.GridSpiTestConfig; @@ -69,7 +73,7 @@ public class GridUriDeploymentFileProcessorSelfTest extends GridUriDeploymentAbs * if {@code false} then it should be undeployed. * @throws Exception If failed. */ - private void proceedTest(String garFileName, String garDescFileName, String taskId, boolean deployed) + private void proceedTest(String garFileName, String garDescFileName, final String taskId, final boolean deployed) throws Exception { info("This test checks broken tasks. All exceptions that might happen are the part of the test."); @@ -123,10 +127,17 @@ public class GridUriDeploymentFileProcessorSelfTest extends GridUriDeploymentAbs // Copy to deployment directory. U.copy(garFile, destDir, true); - // Wait for SPI - Thread.sleep(1000); - try { + // Wait for SPI + GridTestUtils.waitForCondition(new GridAbsPredicateX() { + @Override public boolean applyx() throws IgniteCheckedException { + if (deployed) + return getSpi().findResource(taskId) != null; + else + return getSpi().findResource(taskId) == null; + } + }, 5000); + if (deployed) assert getSpi().findResource(taskId) != null; else
