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.

Sign up for GitHub

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

Jump to bottom

Expect DuplicateI to handle underlying files #6249

Merged
merged 4 commits into from
Sep 17, 2020
Merged

Expect DuplicateI to handle underlying files #6249

merged 4 commits into from
Sep 17, 2020

Conversation

mtbc
Copy link
Member

@mtbc mtbc commented Sep 7, 2020 •
edited
Loading

Update for DuplicationTest.testDuplicateImageWithFileAnnotation since ome/omero-blitz#100 includes an image's attachments in duplication.

@joshmoore
Copy link
Member 

        # Check the Dataset has been duplicated
>       assert len(objsd) == 2
E       assert 1 == 2
E         +1
E         -2

https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-test-integration/lastCompletedBuild/testReport/OmeroPy.test.integration.clitest.test_duplicate/TestDuplicate/testSkipheadDuplication/

joshmoore
joshmoore approved these changes Sep 9, 2020
View reviewed changes
Copy link
Member

@joshmoore joshmoore left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inclusion of the file annotation plus original file in the results makes sense. 👍

@mtbc
Copy link
Member Author

mtbc commented Sep 17, 2020

Merging this should please latest-ci's OMERO-test-integration.

@joshmoore joshmoore merged commit 36cb0bd into ome:develop Sep 17, 2020
@mtbc mtbc deleted the deep-copy branch September 17, 2020 09:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joshmoore joshmoore joshmoore approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mtbc @joshmoore