diff options
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/event/BranchEventTest.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java index 42775a0d617..ee68c7d791d 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java @@ -15,7 +15,9 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; + import junit.framework.Assert; + import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.BranchArchivedState; @@ -134,10 +136,6 @@ public class BranchEventTest { ConflictManagerExternal conflictManager = new ConflictManagerExternal(topLevel, workingBranch); BranchManager.commitBranch(null, conflictManager, true, true); - // if (isRemoteTest()) { - // Thread.sleep(2000); - // } - Assert.assertNotNull(resultBranchEvent); Assert.assertEquals(BranchEventType.Committed, resultBranchEvent.getEventType()); if (isRemoteTest()) { @@ -164,10 +162,6 @@ public class BranchEventTest { BranchManager.purgeBranchPending(workingBranch); - // if (isRemoteTest()) { - // Thread.sleep(2000); - // } - Assert.assertNotNull(resultBranchEvent); Assert.assertEquals(BranchEventType.Purged, resultBranchEvent.getEventType()); if (isRemoteTest()) { |