Skip to content

Fix SPW delete test timeouts (see #11540).#1797

Merged
joshmoore merged 1 commit intoome:developfrom
bpindelski:spw-delete-testfix
Nov 27, 2013
Merged

Fix SPW delete test timeouts (see #11540).#1797
joshmoore merged 1 commit intoome:developfrom
bpindelski:spw-delete-testfix

Conversation

@bpindelski
Copy link
Copy Markdown

This PR should eliminate omero.LockTimeout-s in the testScreen method. It increases the time needed for the delete operation to succeed by multiplying the initial scaling factor time by the amount of plates, wells, fields and acquisitions.

To test - verify that http://hudson.openmicroscopy.org.uk/view/Failing/job/OmeroJava-integration-develop/52/testngreports/ doesn't happen for a couple of days.

This PR can be rebased to develop to keep the code inline.

@pwalczysko
Copy link
Copy Markdown
Member

screen shot 2013-11-20 at 09 57 47
screen shot 2013-11-20 at 09 58 00

@pwalczysko
Copy link
Copy Markdown
Member

This seems to work as expected in the last build (see screenshots above). I suppose that the idea here is to have it couple of days unmerged checking every day again ?

@bpindelski
Copy link
Copy Markdown
Author

@pwalczysko Yes, that's the idea. We could come back to this PR on Friday or Monday?

@pwalczysko
Copy link
Copy Markdown
Member

Friday I am on GRE meeting.
Monday ? (I will need a reminder thought.)

@bpindelski
Copy link
Copy Markdown
Author

@pwalczysko I shall put it on Monday's standup notes.

@pwalczysko
Copy link
Copy Markdown
Member

The builds between #54 and #62 are all green except two: #57 and # 58. Nevertheless none of the two non-green builds have the error dealt with in this PR. So I think this is fine.

joshmoore added a commit that referenced this pull request Nov 27, 2013
Fix SPW delete test timeouts (see #11540).
@joshmoore joshmoore merged commit 37f9444 into ome:develop Nov 27, 2013
@bpindelski bpindelski deleted the spw-delete-testfix branch December 2, 2013 09:54
@bpindelski
Copy link
Copy Markdown
Author

--rebased-to #1855

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants