Skip to content

Fix SPW delete test timeouts (see #11540). (rebased onto dev_4_4)#1855

Merged
joshmoore merged 1 commit intoome:dev_4_4from
bpindelski:rebased/dev_4_4/spw-delete-testfix
Jan 7, 2014
Merged

Fix SPW delete test timeouts (see #11540). (rebased onto dev_4_4)#1855
joshmoore merged 1 commit intoome:dev_4_4from
bpindelski:rebased/dev_4_4/spw-delete-testfix

Conversation

@bpindelski
Copy link
Copy Markdown

This is the same as gh-1797 but rebased onto dev_4_4.


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.

@bpindelski
Copy link
Copy Markdown
Author

--rebased-from #1797

@bpindelski bpindelski restored the rebased/dev_4_4/spw-delete-testfix branch December 2, 2013 10:00
@sbesson
Copy link
Copy Markdown
Member

sbesson commented Jan 6, 2014

joshmoore added a commit that referenced this pull request Jan 7, 2014
…estfix

Fix SPW delete test timeouts (see #11540). (rebased onto dev_4_4)
@joshmoore joshmoore merged commit 9667291 into ome:dev_4_4 Jan 7, 2014
@bpindelski bpindelski deleted the rebased/dev_4_4/spw-delete-testfix branch January 8, 2014 09:07
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