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

Move specific methods from shed_util_common.py to specific_util.py #2269

Merged
merged 15 commits into from
Jun 7, 2016

Conversation

davebx
Copy link
Contributor

@davebx davebx commented Apr 28, 2016

No description provided.

@davebx davebx added kind/refactoring cleanup or refactoring of existing code, no functional changes area/toolshed status/review labels Apr 28, 2016
@davebx davebx added this to the 16.07 milestone Apr 28, 2016
@nsoranzo
Copy link
Member

nsoranzo commented May 4, 2016

get_repositories_by_category() method has been moved, but lib/galaxy/webapps/tool_shed/api/categories.py is not updated accordingly.

@davebx
Copy link
Contributor Author

davebx commented May 4, 2016

Thanks, @nsoranzo. I've added a test for that endpoint, since the existing tests didn't catch that error.

@davebx
Copy link
Contributor Author

davebx commented May 5, 2016

I have more work to do on this, since the alternative is this pull request blocking the work I have going on in other files. WIP for now.

@davebx davebx changed the title Move metadata-related methods from shed_util_common to metadata_util. [WIP] Move specific methods from shed_util_common.py to specific_util.py May 5, 2016
@davebx davebx changed the title [WIP] Move specific methods from shed_util_common.py to specific_util.py Move specific methods from shed_util_common.py to specific_util.py May 16, 2016
@davebx davebx removed the status/WIP label May 16, 2016
@martenson
Copy link
Member

I am 👍 on this, @nsoranzo do you have anything to add before I merge? (since you were also reviewing it before)

self.create_category( name='Test 0000 Basic Repository Features 2', description='Test 0000 Basic Repository Features 2' )
self.login( email=common.admin_email, username=common.admin_username )
category = self.create_category( name='Test 0000 Basic Repository Features 1', description='Test Description 0000 Basic Repository Features 1' )
category = self.create_category( name='Test 0000 Basic Repository Features 2', description='Test Description 0000 Basic Repository Features 2' )
Copy link
Member

Choose a reason for hiding this comment

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

The added category = at the start of this line changes the category in which the repository 'filtering_0000' is created. I guess that the test test_0015_browse_test_0000_category() below does not fail only because a repository of the same name is created in category 'Test 0000 Basic Repository Features 1' during a previous test.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, @nsoranzo. I'll update the code.

@martenson
Copy link
Member

looks good, thanks @davebx !

@martenson martenson merged commit c0b5a28 into galaxyproject:dev Jun 7, 2016
nsoranzo added a commit to nsoranzo/galaxy that referenced this pull request Jun 8, 2016
Broken with the merge of galaxyproject#2269.
@nsoranzo nsoranzo mentioned this pull request Jun 8, 2016
@martenson martenson mentioned this pull request Jun 8, 2016
nsoranzo added a commit to nsoranzo/galaxy that referenced this pull request Jun 8, 2016
It was accidentally removed in PR galaxyproject#2269.
Fix toolshed tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/toolshed kind/refactoring cleanup or refactoring of existing code, no functional changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants