Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #10564: include wells in plate run processing (rebased) #1600

Merged
merged 4 commits into from Oct 10, 2013

Conversation

mtbc
Copy link
Member

@mtbc mtbc commented Oct 8, 2013

When processing a plate run, also process its wells.

Fixes http://trac.openmicroscopy.org.uk/ome/ticket/10450 and http://trac.openmicroscopy.org.uk/ome/ticket/10564

To test, try deleting the last plate run of a plate that another user owns and that you have permission to delete. Then, try double-clicking on the plate in Insight and see if the data browser shows thumbnail weirdness.

Also, make sure that the new HierarchyDeleteTest.testDeletingMultipleRunsWithOrphanedSamples integration test at http://hudson.openmicroscopy.org.uk/job/OmeroJava-integration-develop/lastSuccessfulBuild/testngreports/integration.delete/integration.delete.HierarchyDeleteTest/ passes: it verifies #1430 (comment).

This is not a straight rebase.

@mtbc
Copy link
Member Author

mtbc commented Oct 8, 2013

--rebased-from #1430

@joshmoore
Copy link
Member

Passed Tests
  integration.delete.HierarchyDeleteTest
    testDeletingMultipleRunsWithOrphanedSamples     5.325s  
    testDeletingProject     0.719s  
    testDeletingScreen  1.089s 

The other three testDeleteDataset* tests on develop fail, but that is unrelated.

What was the issue with the rebase, @mtbc ? (i.e. conceptually what conflicts were there?)

@mtbc
Copy link
Member Author

mtbc commented Oct 9, 2013

It was very similar. I tried to clean up the commit history a bit and of course anything touching OmeroJava these days tends to require a little tweaking. I also moved a commit to a different PR that it fit much better in.

@joshmoore
Copy link
Member

👍

joshmoore added a commit that referenced this pull request Oct 10, 2013
fix #10564: include wells in plate run processing (rebased)
@joshmoore joshmoore merged commit e779b3b into ome:develop Oct 10, 2013
@mtbc mtbc deleted the wellsample-to-well-10564 branch October 11, 2013 06:32
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.

None yet

2 participants