Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 335453 - Regression in MergingTest
Summary: Regression in MergingTest
Status: CLOSED FIXED
Alias: None
Product: EMF
Classification: Modeling
Component: cdo.core (show other bugs)
Version: 4.0   Edit
Hardware: PC All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Pascal Lehmann CLA
QA Contact: Eike Stepper CLA
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-01-26 10:20 EST by Pascal Lehmann CLA
Modified: 2011-06-23 03:42 EDT (History)
0 users

See Also:
stepper: review+

Attachments
updated testcase (4.19 KB, patch)
2011-01-26 10:21 EST, Pascal Lehmann CLA 		no flags Details | Diff
Patch v2 - ready to be committed (4.28 KB, patch)
2011-01-26 13:41 EST, Eike Stepper CLA 		no flags Details | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Pascal Lehmann CLA 2011-01-26 10:20:30 EST 
Several tests randomly fail on hudson (Result from merge is empty):
..
junit.framework.AssertionFailedError: expected:<false> but was:<true>
..

It turns out that the merge happens before the commit on the branch could update the lastUpdateTimestamp and therefore the branch changes will never end up in the change set.
Comment 1 Pascal Lehmann CLA 2011-01-26 10:21:29 EST 
Created attachment 187643 [details]
updated testcase

Added waitForUpdate statements before calling merge.
Comment 2 Eike Stepper CLA 2011-01-26 13:41:56 EST 
Created attachment 187668 [details]
Patch v2 - ready to be committed

Good catch, Pascal. I only changed the timeout to DEFAULT_TIMEOUT, which is 2 seconds, IIRC.
Comment 3 Pascal Lehmann CLA 2011-01-27 03:28:06 EST 
Committed revision 6943:
- trunk/plugins/org.eclipse.emf.cdo.tests
Comment 4 Eike Stepper CLA 2011-06-23 03:42:08 EDT 
Available in R20110608-1407