Skip to content

Make test_freeze_bazaar_clone not depend on bazaar.launchpad.net #2515

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

Merged
merged 1 commit into from
Mar 11, 2015

Conversation

msabramo
Copy link
Contributor

Instead of checking out bzr+http://bazaar.launchpad.net/%7Edjango-wikiapp/django-wikiapp/, we create a bzr repo on the fly by calling tests.lib._create_test_package which has been enhanced to be able to create bzr repos:

checkout_path = _create_test_package(script, vcs='bazaar')

The test is no longer marked as network (because it doesn't require the network -- yay!), but it is marked bzr. This allows for skipping the test in environments where bzr is not installed -- e.g.:

py.test tests/functional/test_freeze.py -k 'not bzr'

@msabramo
Copy link
Contributor Author

@pfmoore, @dstufft: Easier to review than #2509 ?

'bzr', 'commit', '-q',
'--author', 'pip <[email protected]>',
'-m', 'initial version', cwd=version_pkg_path,
)
Copy link
Member

Choose a reason for hiding this comment

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

One could add an else clause raising ValueError('Unknown vcs: %r' % vcs)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated. Thanks!

@msabramo msabramo force-pushed the test_freeze_remove_dep_on_launchpad branch 2 times, most recently from 2842d2d to 682c78f Compare March 11, 2015 16:49
@msabramo
Copy link
Contributor Author

OK, I think I handled all of the issues raised by @pfmoore and @xavfernandez. I guess it can be rereviewed and possibly merged if Travis CI passes.

@msabramo msabramo force-pushed the test_freeze_remove_dep_on_launchpad branch 2 times, most recently from 8c102e8 to cbf4687 Compare March 11, 2015 17:18
@msabramo
Copy link
Contributor Author

Added a note to docs/development.rst about how to skip the bzr test if bzr is not installed with:

py.test -k 'not bzr'

@msabramo msabramo force-pushed the test_freeze_remove_dep_on_launchpad branch from cbf4687 to 782e251 Compare March 11, 2015 17:28
@msabramo
Copy link
Contributor Author

Travis CI passed

@msabramo
Copy link
Contributor Author

Merge conflicts from the other PRs that were merged. Will fix...

@msabramo msabramo force-pushed the test_freeze_remove_dep_on_launchpad branch from 782e251 to 7f5566f Compare March 11, 2015 22:07
@msabramo
Copy link
Contributor Author

Merge conflicts fixed.

@pfmoore
Copy link
Member

pfmoore commented Mar 11, 2015

I'll merge once Travis builds succeed (assuming Travis haven't blacklisted us for melting their servers ;-))

pfmoore added a commit that referenced this pull request Mar 11, 2015
…chpad

Make test_freeze_bazaar_clone not depend on bazaar.launchpad.net
@pfmoore pfmoore merged commit c38291e into pypa:develop Mar 11, 2015
@lock lock bot added the auto-locked Outdated issues that have been locked by automation label Jun 4, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Jun 4, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
auto-locked Outdated issues that have been locked by automation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants