fix #12011: move/delete datasets that share images #2180
Conversation
|
There is a possibility that this is breaking http://ci.openmicroscopy.org/view/Failing/job/OMERO-5.0-merge-integration-python/160/. Holding off with review for now. |
|
Okay to review. @ximenesuk is kindly sorting out the integration tests to match the new behavior. |
|
I'm not sure if just changing the tests will work here. Probably needs a review of spreadsheets and such. /cc @pwalczysko @bramalingam etc. |
|
The change is just that now when you try to move a dataset, it moves what it can but leaves behind images that can't be moved. (Or, same for delete.) The tests were moving a dataset containing an image that couldn't be moved, and expecting the move to fail: the fix is to instead have them expect the image not to move. The do-what-you-can feels like a feature to me, but if it should just return an error instead and not do anything and have the user sort out which images are the problem ones, we could do that instead. |
|
The curious can try the do-what-you-can out on gretzky now. (-: |
|
@pwalczysko can decide if this is okay before @ximenesuk fixes the tests and this PR goes in. |
|
will deal with this after return from US. |
|
Move to Group works fine in both clients - Images stays behind if it is in a Dataset that is not moving. Delete also works OK (tested in web). |
|
Great, thank you very much for testing. |
|
-create a dataset ("Duplicate-1") If the 1) problem is really catered for and the 2) problem is possibly envisaged as "necessary evil at this stage", then ready to merge. |
|
@ximenesuk can cater for integration test issues but the other problem is unacceptable: I will investigate. |
|
Oh, I see what you mean: this is an issue where the client's view of the dataset got out of sync, so that also if you refresh "Duplicate-2" after the move, the copied-then-moved image also goes away and the black thumb never returns? If so I am much happier, especially as no nasty exception appears; I could file a ticket about that. |
|
@pwalczysko: apart from the temporary black thumbnail issue, do you see any other problems? Is this moving/deleting behavior in general an okay idea? |
|
@ximenesuk: okay to receive test fixes now then I guess, PR or cherry-pick as you like. |
|
@mtbc yes, otherwise it works fine. It is as you describe, the black thumb is temporarily there, afterwards vanishes and does not come back. (I meant I should have been warned about the vanishing of the copied image, but this is a matter of larger discussion, this PR improves matters definitely). |
|
Great, thank you. If we merge this PR I can file a ticket about that then. |
|
@ximenesuk discovered that this PR allows splitting MIFs via the API and is therefore presently unacceptable. |
mtbc
changed the title
mtbc
changed the title
|
--exclude as this PR now breaks plate delete. |
|
Some dataset delete test tweaks probably coming from @ximenesuk. |
|
I think this addresses the issue correctly ximenesuk@861a69f Please cherry-pick. |
|
@mtbc: is this ready for review again? |
|
No, this is the PR depending on our "spec.xml advice" e-mail thread. I can experiment some more with it myself, though, or if your judgment is that it's probably going to just be too hairy then maybe we just close and postpone until after the alternative graph traversal implementation work settles. (At least for the original ticket, perhaps client people can at least catch the error and provide a helpful dialog message.) |
|
Added http://trac.openmicroscopy.org.uk/ome/ticket/11610 to https://trac.openmicroscopy.org.uk/ome/ticket/11752 since this will likely profit from the new graph implementation. http://trac.openmicroscopy.org.uk/ome/ticket/12011 needs to be re-opened for a client review. /cc @will-moore @jburel Closing for the moment until we have a better way to solve these issues. |
not ready for review
Fixes http://trac.openmicroscopy.org.uk/ome/ticket/12011 and assists http://trac.openmicroscopy.org.uk/ome/ticket/11610.
Try moving and deleting datasets that contain images that are also in other datasets. Something not-obviously-wrong ought to happen, which probably suffices until the major graph traversal reworking of https://trac.openmicroscopy.org.uk/ome/ticket/11779 is done. Datasets should be movable and deletable and their images ought not to be left orphaned.
Also check that http://ci.openmicroscopy.org/job/OMERO-5.0-merge-integration-python/lastSuccessfulBuild/testReport/test.gatewaytest/test_chgrp/ and http://ci.openmicroscopy.org/job/OMERO-5.0-merge-integration-python/lastSuccessfulBuild/testReport/test.integration.test_chgrp/TestChgrp/ have no skips or fails.