Community
Participate
Working Groups
We got the following test failure for Java 5.0 in a nightly build. Here's the build link http://fullmoon.ottawa.ibm.com/eclipse/downloads/drops/N20060607-0010/testResults.php merge failed: improper diff for L/testDeletionConflictsA-1149669897838/delete1.txt expected in-sync but was outgoing addition junit.framework.AssertionFailedError: merge failed: improper diff for L/testDeletionConflictsA-1149669897838/delete1.txt expected in-sync but was outgoing addition at org.eclipse.team.tests.ccvs.core.subscriber.SyncInfoSource.assertDiffKindEquals(SyncInfoSource.java:153) at org.eclipse.team.tests.ccvs.ui.ModelParticipantSyncInfoSource.assertSyncEquals(ModelParticipantSyncInfoSource.java:144) at org.eclipse.team.tests.ccvs.ui.ModelParticipantSyncInfoSource.assertInSync(ModelParticipantSyncInfoSource.java:362) at org.eclipse.team.tests.ccvs.ui.ModelParticipantSyncInfoSource.mergeResources(ModelParticipantSyncInfoSource.java:351) at org.eclipse.team.tests.ccvs.ui.ModelParticipantSyncInfoSource.overrideAndUpdateResources(ModelParticipantSyncInfoSource.java:401) at org.eclipse.team.tests.ccvs.core.subscriber.CVSWorkspaceSubscriberTest.overrideAndUpdate(CVSWorkspaceSubscriberTest.java:261) at org.eclipse.team.tests.ccvs.core.subscriber.CVSWorkspaceSubscriberTest.testDeletionConflicts(CVSWorkspaceSubscriberTest.java:700) at org.eclipse.team.tests.ccvs.core.EclipseTest.runTest(EclipseTest.java:1379) at org.eclipse.team.tests.ccvs.core.EclipseTest.runBare(EclipseTest.java:1226) at junit.extensions.TestDecorator.basicRun(TestDecorator.java:22) at junit.extensions.TestSetup$1.protect(TestSetup.java:19) at junit.extensions.TestSetup.run(TestSetup.java:23) at junit.extensions.TestDecorator.basicRun(TestDecorator.java:22) at junit.extensions.TestSetup$1.protect(TestSetup.java:19) at junit.extensions.TestSetup.run(TestSetup.java:23) at junit.extensions.TestDecorator.basicRun(TestDecorator.java:22) at junit.extensions.TestSetup$1.protect(TestSetup.java:19) at junit.extensions.TestSetup.run(TestSetup.java:23) at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:330) at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:204) at org.eclipse.test.UITestApplication$3.run(UITestApplication.java:188) at org.eclipse.swt.widgets.RunnableLock.run(RunnableLock.java:35) at org.eclipse.swt.widgets.Synchronizer.runAsyncMessages(Synchronizer.java:123) at org.eclipse.swt.widgets.Display.runAsyncMessages(Display.java:3141) at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:2843) at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.java:1914) at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:1878) at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:419) at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:149) at org.eclipse.ui.internal.ide.IDEApplication.run(IDEApplication.java:95) at org.eclipse.test.UITestApplication.runApplication(UITestApplication.java:131) at org.eclipse.test.UITestApplication.run(UITestApplication.java:58) at org.eclipse.core.internal.runtime.PlatformActivator$1.run(PlatformActivator.java:78) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:92) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:68) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:400) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:177) at org.eclipse.core.launcher.Main.invokeFramework(Main.java:336) at org.eclipse.core.launcher.Main.basicRun(Main.java:280) at org.eclipse.core.launcher.Main.run(Main.java:977) at org.eclipse.core.launcher.Main.main(Main.java:952)
I can't see anything obvious that would case this. We'll keep an eye on this for 3.2.1 to see if it happens again.
Hasn't appeared in a while - moving to 3.3.
Got it again: merge failed: improper diff for L/testDeletionConflictsA-1160123421181/delete2.txt expected in-sync but was outgoing addition junit.framework.AssertionFailedError: merge failed: improper diff for L/testDeletionConflictsA-1160123421181/delete2.txt expected in-sync but was outgoing addition at org.eclipse.team.tests.ccvs.core.subscriber.SyncInfoSource.assertDiffKindEquals(SyncInfoSource.java:153) at org.eclipse.team.tests.ccvs.ui.ModelParticipantSyncInfoSource.assertSyncEquals(ModelParticipantSyncInfoSource.java:145) at org.eclipse.team.tests.ccvs.ui.ModelParticipantSyncInfoSource.assertInSync(ModelParticipantSyncInfoSource.java:364) at org.eclipse.team.tests.ccvs.ui.ModelParticipantSyncInfoSource.mergeResources(ModelParticipantSyncInfoSource.java:353) at org.eclipse.team.tests.ccvs.ui.ModelParticipantSyncInfoSource.overrideAndUpdateResources(ModelParticipantSyncInfoSource.java:403) at org.eclipse.team.tests.ccvs.core.subscriber.CVSWorkspaceSubscriberTest.overrideAndUpdate(CVSWorkspaceSubscriberTest.java:261) at org.eclipse.team.tests.ccvs.core.subscriber.CVSWorkspaceSubscriberTest.testDeletionConflicts(CVSWorkspaceSubscriberTest.java:700) at org.eclipse.team.tests.ccvs.core.EclipseTest.runTest(EclipseTest.java:1379) at org.eclipse.team.tests.ccvs.core.EclipseTest.runBare(EclipseTest.java:1226) at junit.extensions.TestDecorator.basicRun(TestDecorator.java:24) at junit.extensions.TestSetup$1.protect(TestSetup.java:21) at junit.extensions.TestSetup.run(TestSetup.java:25) at junit.extensions.TestDecorator.basicRun(TestDecorator.java:24) at junit.extensions.TestSetup$1.protect(TestSetup.java:21) at junit.extensions.TestSetup.run(TestSetup.java:25) at junit.extensions.TestDecorator.basicRun(TestDecorator.java:24) at junit.extensions.TestSetup$1.protect(TestSetup.java:21) at junit.extensions.TestSetup.run(TestSetup.java:25) at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:327) at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:201) at org.eclipse.test.UITestApplication$3.run(UITestApplication.java:188) at org.eclipse.swt.widgets.RunnableLock.run(RunnableLock.java:35) at org.eclipse.swt.widgets.Synchronizer.runAsyncMessages(Synchronizer.java:123) at org.eclipse.swt.widgets.Display.runAsyncMessages(Display.java:3182) at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:2884) at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.java:1916) at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:1880) at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:419) at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:149) at org.eclipse.ui.internal.ide.IDEApplication.run(IDEApplication.java:95) at org.eclipse.test.UITestApplication.runApplication(UITestApplication.java:131) at org.eclipse.test.UITestApplication.run(UITestApplication.java:58) at org.eclipse.core.internal.runtime.PlatformActivator$1.run(PlatformActivator.java:78) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:104) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:74) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:348) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:165) at org.eclipse.core.launcher.Main.invokeFramework(Main.java:341) at org.eclipse.core.launcher.Main.basicRun(Main.java:285) at org.eclipse.core.launcher.Main.run(Main.java:987) at org.eclipse.core.launcher.Main.main(Main.java:962)
Created attachment 51531 [details] Console log from the latest failure
*** Bug 157164 has been marked as a duplicate of this bug. ***
Here's another failure which may or may not be related: testIncomingChanges: improper diff for L/testIncomingChanges-1171019178533/folder1/a.txt expected in-sync but was conflicting addition junit.framework.AssertionFailedError: testIncomingChanges: improper diff for L/testIncomingChanges-1171019178533/folder1/a.txt expected in-sync but was conflicting addition at org.eclipse.team.tests.ccvs.core.subscriber.SyncInfoSource.assertDiffKindEquals(SyncInfoSource.java:153) at org.eclipse.team.tests.ccvs.ui.ModelParticipantSyncInfoSource.assertSyncEquals(ModelParticipantSyncInfoSource.java:144) at org.eclipse.team.tests.ccvs.core.subscriber.CVSSyncSubscriberTest.assertSyncEquals(CVSSyncSubscriberTest.java:77) at org.eclipse.team.tests.ccvs.core.subscriber.CVSSyncSubscriberTest.assertSyncEquals(CVSSyncSubscriberTest.java:71) at org.eclipse.team.tests.ccvs.core.subscriber.CVSWorkspaceSubscriberTest.assertSyncEquals(CVSWorkspaceSubscriberTest.java:121) at org.eclipse.team.tests.ccvs.core.subscriber.CVSWorkspaceSubscriberTest.testIncomingChanges(CVSWorkspaceSubscriberTest.java:312) at org.eclipse.team.tests.ccvs.core.EclipseTest.runTest(EclipseTest.java:1379) at org.eclipse.team.tests.ccvs.core.EclipseTest.runBare(EclipseTest.java:1226) at junit.extensions.TestDecorator.basicRun(TestDecorator.java:22) at junit.extensions.TestSetup$1.protect(TestSetup.java:19) at junit.extensions.TestSetup.run(TestSetup.java:23) at junit.extensions.TestDecorator.basicRun(TestDecorator.java:22) at junit.extensions.TestSetup$1.protect(TestSetup.java:19) at junit.extensions.TestSetup.run(TestSetup.java:23) at junit.extensions.TestDecorator.basicRun(TestDecorator.java:22) at junit.extensions.TestSetup$1.protect(TestSetup.java:19) at junit.extensions.TestSetup.run(TestSetup.java:23) at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:330) at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:204) at org.eclipse.test.UITestApplication$3.run(UITestApplication.java:188) at org.eclipse.swt.widgets.RunnableLock.run(RunnableLock.java:35) at org.eclipse.swt.widgets.Synchronizer.runAsyncMessages(Synchronizer.java:123) at org.eclipse.swt.widgets.Display.runAsyncMessages(Display.java:3181) at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:2936) at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.java:1930) at org.eclipse.ui.internal.Workbench.runUI(Workbench.java:1894) at org.eclipse.ui.internal.Workbench.createAndRunWorkbench(Workbench.java:422) at org.eclipse.ui.PlatformUI.createAndRunWorkbench(PlatformUI.java:149) at org.eclipse.ui.internal.ide.IDEApplication.run(IDEApplication.java:95) at org.eclipse.test.UITestApplication.runApplication(UITestApplication.java:131) at org.eclipse.test.UITestApplication.run(UITestApplication.java:58) at org.eclipse.core.internal.runtime.PlatformActivator$1.run(PlatformActivator.java:78) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:92) at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:68) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:400) at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:177) at org.eclipse.core.launcher.Main.invokeFramework(Main.java:336) at org.eclipse.core.launcher.Main.basicRun(Main.java:280) at org.eclipse.core.launcher.Main.run(Main.java:977) at org.eclipse.core.launcher.Main.main(Main.java:952)
The portions of the tests that could potentially cause timing related failures have been removed.
