Fix SPW delete test timeouts (see #11540). (rebased onto dev_4_4)#1855
Merged
joshmoore merged 1 commit intoome:dev_4_4from Jan 7, 2014
Merged
Conversation
Author
|
--rebased-from #1797 |
Member
|
Looking at http://hudson.openmicroscopy.org.uk/job/OmeroJava-integration-stable/lastCompletedBuild/testngreports/integration.delete/integration.delete.SpwDeleteTest/? and the history of individual tests, this looks ready to merge. |
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)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is the same as gh-1797 but rebased onto dev_4_4.
This PR should eliminate omero.LockTimeout-s in the
testScreenmethod. 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
developto keep the code inline.