Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 314605

Summary:	MergingTest fails occasionally on Hudson
Product:	[Modeling] EMF	Reporter:	Eike Stepper <stepper>
Component:	cdo.core	Assignee:	Eike Stepper <stepper>
Status:	CLOSED FIXED	QA Contact:
Severity:	normal
Priority:	P3
Version:	3.0
Target Milestone:	---
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description Eike Stepper

2010-05-27 02:25:03 EDT

Regression

org.eclipse.emf.cdo.tests.AllTestsAllConfigs$Scenario[Combined, MEMBranches, JVM, Native]$org.eclipse.emf.cdo.tests.MergingTest.testFromBranchWithChangesInSource (from MergingTest)

Stacktrace

junit.framework.AssertionFailedError: expected:<false> but was:<true>
	at junit.framework.Assert.fail(Assert.java:47)
	at junit.framework.Assert.failNotEquals(Assert.java:283)
	at junit.framework.Assert.assertEquals(Assert.java:64)
	at junit.framework.Assert.assertEquals(Assert.java:143)
	at junit.framework.Assert.assertEquals(Assert.java:149)
	at org.eclipse.emf.cdo.tests.MergingTest.testFromBranchWithChangesInSource(MergingTest.java:428)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
	at java.lang.reflect.Method.invoke(Method.java:592)
	at junit.framework.TestCase.runTest(TestCase.java:168)
	at junit.framework.TestCase.runBare(TestCase.java:134)
	at org.eclipse.net4j.util.tests.AbstractOMTest.runBare(AbstractOMTest.java:124)
	at org.eclipse.emf.cdo.tests.config.impl.ConfigTest.runBare(ConfigTest.java:422)
	at junit.framework.TestResult$1.protect(TestResult.java:110)
	at junit.framework.TestResult.runProtected(TestResult.java:128)
	at junit.framework.TestResult.run(TestResult.java:113)
	at junit.framework.TestCase.run(TestCase.java:124)
	at org.eclipse.net4j.util.tests.AbstractOMTest.run(AbstractOMTest.java:146)
	at junit.framework.TestSuite.runTest(TestSuite.java:232)
	at org.eclipse.emf.cdo.tests.config.impl.ConfigTestSuite$TestWrapper.runTest(ConfigTestSuite.java:126)
	at junit.framework.TestSuite.run(TestSuite.java:227)
	at junit.framework.TestSuite.runTest(TestSuite.java:232)
	at junit.framework.TestSuite.run(TestSuite.java:227)
	at junit.framework.TestSuite.runTest(TestSuite.java:232)
	at junit.framework.TestSuite.run(TestSuite.java:227)
	at org.eclipse.jdt.internal.junit.runner.junit3.JUnit3TestReference.run(JUnit3TestReference.java:130)
	at org.eclipse.jdt.internal.junit.runner.TestExecution.run(TestExecution.java:38)
	at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:467)
	at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:683)
	at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.run(RemoteTestRunner.java:390)
	at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.main(RemoteTestRunner.java:197)

Comment 1 Eike Stepper

2010-05-27 04:47:15 EDT

The following in CDOTransactionImpl.merge() turned out to be too unexact (an approximation):

    long now = session.getRepositoryInfo().getTimeStamp();
    
This is better:

    long now = getLastUpdateTime();
    
getLastUpdateTime() was introduced to CDOViewImpl by bug 314544.

Comment 2 Eike Stepper

2010-05-27 04:47:30 EDT

Committed to HEAD

Comment 3 Eike Stepper

2010-06-29 04:36:29 EDT

Available in 3.0 GA:
http://download.eclipse.org/modeling/emf/cdo/updates/3.0-releases/