Bug 344930 - [server] testConfilct and testMergeConflict failed in N201105052000
Summary: [server] testConfilct and testMergeConflict failed in N201105052000
Status: RESOLVED FIXED
Alias: None
Product: Orion (Archived)
Classification: ECD
Component: Client (show other bugs)
Version: 0.2   Edit
Hardware: PC Windows XP
: P3 normal (vote)
Target Milestone: 0.2   Edit
Assignee: Tomasz Zarna CLA
QA Contact:
URL: http://download.eclipse.org/e4/orion/...
Whiteboard:
Keywords: test
Depends on:
Blocks:
 
Reported: 2011-05-06 04:41 EDT by Tomasz Zarna CLA
Modified: 2011-09-01 11:42 EDT (History)
2 users (show)

See Also:

Attachments
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 Tomasz Zarna CLA 2011-05-06 04:41:58 EDT 
N201105052000

testConfilct Error expected:<1> but was:<0> 

java.lang.AssertionError: expected:<1> but was:<0>
at org.eclipse.orion.server.tests.servlets.git.GitStatusTest.testConfilct(GitStatusTest.java:793)
at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:416)
at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:249)
at org.eclipse.test.CoreTestApplication.runTests(CoreTestApplication.java:36)
at org.eclipse.test.CoreTestApplication.run(CoreTestApplication.java:32)
at org.eclipse.equinox.internal.app.EclipseAppContainer.callMethodWithException(EclipseAppContainer.java:587)
at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:198)
at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:110)
at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:79)
at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:344)
at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:179)
at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:622)
at org.eclipse.equinox.launcher.Main.basicRun(Main.java:577)
at org.eclipse.equinox.launcher.Main.run(Main.java:1410)
at org.eclipse.equinox.launcher.Main.main(Main.java:1386)
at org.eclipse.core.launcher.Main.main(Main.java:34)
 
 
testMergeConflict Error expected:<1> but was:<0> 

java.lang.AssertionError: expected:<1> but was:<0>
at org.eclipse.orion.server.tests.servlets.git.GitMergeTest.testMergeConflict(GitMergeTest.java:334)
at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:416)
at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:249)
at org.eclipse.test.CoreTestApplication.runTests(CoreTestApplication.java:36)
at org.eclipse.test.CoreTestApplication.run(CoreTestApplication.java:32)
at org.eclipse.equinox.internal.app.EclipseAppContainer.callMethodWithException(EclipseAppContainer.java:587)
at org.eclipse.equinox.internal.app.EclipseAppHandle.run(EclipseAppHandle.java:198)
at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.runApplication(EclipseAppLauncher.java:110)
at org.eclipse.core.runtime.internal.adaptor.EclipseAppLauncher.start(EclipseAppLauncher.java:79)
at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:344)
at org.eclipse.core.runtime.adaptor.EclipseStarter.run(EclipseStarter.java:179)
at org.eclipse.equinox.launcher.Main.invokeFramework(Main.java:622)
at org.eclipse.equinox.launcher.Main.basicRun(Main.java:577)
at org.eclipse.equinox.launcher.Main.run(Main.java:1410)
at org.eclipse.equinox.launcher.Main.main(Main.java:1386)
at org.eclipse.core.launcher.Main.main(Main.java:34)
Comment 1 Tomasz Zarna CLA 2011-05-06 04:43:16 EDT 
Both pass when run locally.
Comment 2 Tomasz Zarna CLA 2011-05-09 06:07:28 EDT 
Happened again in N201105082000.
Comment 3 Tomasz Zarna CLA 2011-05-09 06:51:49 EDT 
Andrew, is there a chance to have a peek on console output? The tests pass when run locally, I tried it on Windows and Linux. The log could give me a hint what's going on.
Comment 4 Tomasz Zarna CLA 2011-05-09 07:00:54 EDT 
Got it! Once I've pulled changes from JGit I'm able to reproduce it over here. Forgot that the build server is using the latest n-build of JGit, while my version/sources were a little bit stale (on purpose, see bug 339242).
Comment 6 Andrew Niefer CLA 2011-05-09 11:24:27 EDT 
I have made a change to the releng builder, so in the future, the link "View the build logs for the current build" on the build download page should include the console output from the tests.  This will be the log for the entire build, the test results will be near the bottom.