Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrescobar2010-09-14 02:32:09 +0000
committerRyan D. Brooks2010-09-14 02:32:09 +0000
commit92895122715236fea53b1d099060186e367fba44 (patch)
tree4b8143a445615e6fc6970887ea0e18aa32b94521 /plugins/org.eclipse.osee.framework.skynet.core.test
parentc980a0378665763b4f84c282507323b6d20d19c6 (diff)
downloadorg.eclipse.osee-92895122715236fea53b1d099060186e367fba44.tar.gz
org.eclipse.osee-92895122715236fea53b1d099060186e367fba44.tar.xz
org.eclipse.osee-92895122715236fea53b1d099060186e367fba44.zip
bug: Fix intermittent test failure in conflict tests by adding expected conflict range
Diffstat (limited to 'plugins/org.eclipse.osee.framework.skynet.core.test')
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java
index e29642f2ed..9637577869 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTest.java
@@ -272,7 +272,7 @@ public class ConflictTest {
int expectedNumber = ConflictTestManager.numberOfArtifactsOnMergeBranch();
int actualNumber = artifacts.size();
- assertEquals(
+ assertTrue(
"(Intermittent failures - needs re-write) - The merge Branch does not contain the expected number of artifacts: ",
(expectedNumber <= actualNumber) && (actualNumber <= (expectedNumber + 1)));
} catch (Exception ex) {

Back to the top