Skip to content

Post merge#5243

Merged
joshmoore merged 11 commits intoome:metadata53from
atarkowska:post_merge
May 3, 2017
Merged

Post merge#5243
joshmoore merged 11 commits intoome:metadata53from
atarkowska:post_merge

Conversation

@atarkowska
Copy link
Copy Markdown
Member

@atarkowska atarkowska commented Apr 10, 2017

What this PR does

fix failing tests
cherry-picked to #5241

@atarkowska
Copy link
Copy Markdown
Member Author

@jburel do you see any more name changes/fixes in m53?

@joshmoore
Copy link
Copy Markdown
Member

Changes all make sense. Are the tests currently being run somewhere?

@jburel
Copy link
Copy Markdown
Member

jburel commented Apr 18, 2017

@aleksandra-tarkowska sorry I missed the notification. I will have a look

@atarkowska
Copy link
Copy Markdown
Member Author

@joshmoore
Copy link
Copy Markdown
Member

Thanks, @aleksandra-tarkowska. From my point-of-view, this is good to merge.

plateCols=colCount)[0]
plate2 = self.test.importPlates(plateRows=rowCount,
plateCols=colCount)[0]
plate1 = self.test.import_plates(plateRows=rowCount,
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This should be plate_rows and plate_cols if the method from testlib is used

@atarkowska
Copy link
Copy Markdown
Member Author

@jburel thanks for the hint, looks like all metadata tests are passing now :)

@jburel
Copy link
Copy Markdown
Member

jburel commented Apr 20, 2017

It looks good now

@atarkowska
Copy link
Copy Markdown
Member Author

atarkowska commented Apr 21, 2017

cherry-picked fix from #5241 for py26 (just for consistency)

@joshmoore
Copy link
Copy Markdown
Member

👍

@joshmoore joshmoore merged commit 6a7279a into ome:metadata53 May 3, 2017
@joshmoore joshmoore deleted the post_merge branch May 3, 2017 19:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants