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

Bug 364561

Summary: test failures due to unexpected outgoing changes
Product: [Eclipse Project] Platform Reporter: Malgorzata Janczarska <malgorzata.tomczyk>
Component: CVSAssignee: Tomasz Zarna <tomasz.zarna>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P3    
Version: 3.8   
Target Milestone: 3.8 M4   
Hardware: PC   
OS: Windows 7   
URL: http://download.eclipse.org/eclipse/downloads/drops/N20111121-2000
Whiteboard:
Attachments:
Description Flags
Fix v01
none
mylyn/context/zip
none
Fix v02 none

Description Malgorzata Janczarska CLA 2011-11-23 05:14:43 EST 
I20111122-0912

22 test failed with a similar reason:
"Subscriber contains change: outgoing addition for /<project>/<folder> but the context"
Comment 1 Malgorzata Janczarska CLA 2011-11-23 05:40:04 EST 
All failures are found in createProject(String, String[]) - a helper function that creates a project with some resources and shares it.
One failure is different than all others: testUpdateWithNoChange, it may have the same root cause, but this needs to be investigated.
Comment 2 Tomasz Zarna CLA 2011-11-23 06:09:39 EST 
These are caused by bug 352016 and the fact that we decided to honor the "Consider contents to ignore changes" aka "Only look at timestamps" preference in syncs.
Comment 3 Tomasz Zarna CLA 2011-11-23 09:29:43 EST 
Created attachment 207417 [details]
Fix v01

The CVSProviderTest.testUpdateWithNoChange() needs to have the preference turn on manually in order to work as expected.

As for the other tests, the culprit was in the org.eclipse.team.internal.core.subscribers.SubscriberDiffTreeEventHandler.addDiff(IDiff, IProgressMonitor) method which now started to remove diffs for folders. I've modified the filter to return true for folders.

I'm having hard times with 3 tests in org.eclipse.team.tests.ccvs.core.subscriber.CVSMergeSubscriberTest, namely: testMarkAsMerged, testLocalScrub and testUnmergableConflicts. They seem to be failing randomly. Gosia, could you please how the patch works for you?
Comment 4 Tomasz Zarna CLA 2011-11-23 09:29:49 EST 
Created attachment 207418 [details]
mylyn/context/zip
Comment 5 Malgorzata Janczarska CLA 2011-11-23 10:14:37 EST 
(In reply to comment #3)
> I'm having hard times with 3 tests in
> org.eclipse.team.tests.ccvs.core.subscriber.CVSMergeSubscriberTest, namely:
> testMarkAsMerged, testLocalScrub and testUnmergableConflicts. They seem to be
> failing randomly. Gosia, could you please how the patch works for you?
I have constantly failing 2 tests testKeywordSubstitution and testKeyworkSubsBinToText but apart from those two all tests passed.
Comment 6 Tomasz Zarna CLA 2011-11-23 11:27:41 EST 
Created attachment 207427 [details]
Fix v02

Forgot about non-model syncs.
Comment 7 Tomasz Zarna CLA 2011-11-23 11:52:11 EST 
Fixed with 1d317a8da6b135518fc0f27e059e2d38a94760f8. Available in builds >= N20111123-2000.