Fix cassette context decorator nesting issues #108

colonelpanic8 · 2014-09-18T12:49:40Z

Sorry for spamming you with pull requests.
This is getting kind of big (it looks works than it is, I promise) so just to make sure that we are keeping track, here is a list of all of the changes that are included in this pull request:

Move context management of use_cassette into CassetteContextDecorator so that a separate cassette is created for each invocation of a use_cassette decorated function.
VCR now passes a callable to CassetteContextDecorator (instead of passing the arguments for cassette creation) so that changes to the VCRs default configuration can propagate to functions that have already been decorated.
Add mock and contextlib2 as dependencies.
Do all patching through mock.patch. This made it so that CassetteContextDecorators actually stack properly.
Remove enter and exit from Cassette class.
Add before_record_response hook to Cassette and VCR classes. This is mainly for the purpose of scrubbing responses.
Version bump (1.0.3 -> 1.0.4). Should this be a minor version bump instead?
Remove contextdecorator dependency.

closes #102, #107, #109

…tte can be called multiple times.

This reverts commit 366e2b7. Conflicts: tests/unit/test_cassettes.py

… to list.

… that changes to the default settings on the vcr properly propogate.

…ictionary patch.

colonelpanic8 · 2014-09-18T15:04:17Z

lol @ three builds in a row failing. I have a good feeling about e1e08c7 though. I think it might actually pass.

…ent attribute with hasattr.

…each cassette context instead of replacing the cassette on the existing mock connection.

…re_first_nesting. by using a single class and patching cassette on that class. Not a great solution :\

…ontext is gone.

colonelpanic8 · 2014-09-19T00:06:45Z

8947f0f is going to fail because it has a the test from #109. Solving that one is sort of tricky, and it could require a little bit of gross surgery on VCRConnection (or a major refactor).

kevin1024 · 2014-09-19T03:05:03Z

Sorry for spamming you with pull requests.

No need to apologize, it's great. In fact, are you interested in helping me maintain vcrpy?

Do all patching through mock.patch. This made it so that CassetteContextDecorators actually stack properly.

Wow, that's another use case I never thought about before. Yeah, I guess having it work like a stack is the right way to do it.

Add before_record_response hook to Cassette and VCR classes. This is mainly for the purpose of scrubbing responses.

OK, I could see this being useful. You would need to add a section to the README about how to use this feature, and the difference from before_record

Version bump (1.0.3 -> 1.0.4). Should this be a minor version bump instead?

Definitely a minor version bump, we are adding new features.

colonelpanic8 · 2014-09-19T18:49:19Z

Yeah I'd love to help you out with the maintenance of vcrpy! What exactly would that entail?

Good call on adding a section to the README for before_record_reponse. I'm going to take a swing at #109, but I sort of suspect that it could be a bit tricky so I might give up on getting it into this version. In that case I'd like to leave the test that I wrote for it in, so is it cool if I disable it for now with the reason set to the issue number?

I don't think the issue is THAT serious because the use case of using a session across contexts is somewhat obscure, but the behavior is pretty surprising and I can contrive a few situations where you might want to do something like that.

colonelpanic8 · 2014-09-19T19:03:18Z

Also, how do you feel about adding https://github.com/mverteuil/pytest-ipdb (or just raw ipdb) as a py.test plugin. ipdb is just so much better than raw pdb.

kevin1024 · 2014-09-19T21:03:55Z

Yeah I'd love to help you out with the maintenance of vcrpy! What exactly would that entail?

I just gave you commit access, just go ahead and fix bugs. If it's a new feature or a backwards incompatible change, run it by me first though. You'll probably have to ping me to upload to pypi if you want to do a new release.

I'd like to leave the test that I wrote for it in, so is it cool if I disable it for now with the reason set to the issue number?

Yes, sounds good to me, you can mark it xfail

I don't think the issue is THAT serious because the use case of using a session across contexts is somewhat obscure, but the behavior is pretty surprising and I can contrive a few situations where you might want to do something like that.

Yup, it's a pretty bizarre bug, but I agree, it would be nice to have a fix.

colonelpanic8 · 2014-09-19T21:10:20Z

Cool, thanks! Do you still want me to merge with --no-ff for the sake of record keeping or are you okay with changes pushed directly to master?

kevin1024 · 2014-09-19T21:16:23Z

You can just push to master if you want, the changes in this pull request aren't exactly related anyway (new before_save_request feature, bugfixes, etc)

… another failing test for kevin1024#109

…ted_before_first_nesting. by using a single class and patching cassette on that class. Not a great solution :\" This reverts commit 2bf23b2.

colonelpanic8 · 2014-09-19T22:36:10Z

Cool. that sounds good. I think I have to push all of this together just because I've been touching a lot of the same files in the various commits ive had. I'm hoping to try to get everything done somewhat soon. If you could help me get the new version into pypy that would be great. Is there anything else that you'd want to get into a new version?

kevin1024 · 2014-09-19T23:04:46Z

Sure, just ping me when you're ready. A few things I like to do for releases:

Make sure all the tests are passing :)
Add a note to the changelog in the README.md
Make a new release on Github, this will tag it too. tags look like vx.x.x
Push to pypi.

Is there anything else that you'd want to get into a new version?

I think this version has plenty (thanks for all your work!) - some bugfixes and also a new feature.

…ns in ConnectionPools.

…md with description of `before_record_response`

…ven if import fails. Make _recursively_apply_get_cassette_subclass actually work with dictionaries.

…onnections in ConnectionPools." This reverts commit dc249b0. Conflicts: vcr/patch.py

…_nesting_issues Fix cassette context decorator nesting issues

colonelpanic8 · 2014-09-21T12:38:40Z

Hey. I wasn't able to push to pypi because I don't have access. Can you do this for me?

kevin1024 · 2014-09-21T17:22:08Z

OK, pushed to pypi. Thanks for your work!

colonelpanic8 added 12 commits September 16, 2014 23:45

Add use_cassette class so functinos that are decorated with use_casse…

cb05f41

…tte can be called multiple times.

Bump version number for new use_cassette_decorator.

0cfe63e

Add global toggle to use_cassette.

366e2b7

Add before_record_response to Cassette and VCR.

9a4f5f2

Change default paramters to VCR from lists to tuples.

8e01426

Revert "Add global toggle to use_cassette."

a08c90c

This reverts commit 366e2b7. Conflicts: tests/unit/test_cassettes.py

Fix failure in test_local_host resulting from attempting to add tuple…

8db4600

… to list.

use_cassette -> CassetteContextDecorator

472cc3b

Change use_cassette to pass a function to CassetteContextDecorator so…

643a4c9

… that changes to the default settings on the vcr properly propogate.

Failing tests for nested context decoration.

9a56458

Use mock for patching http connection objects.

958aac3

Python version agnostic way of getting the next item in the generator.

2193008

This was referenced Sep 18, 2014

Add use_cassette class so functinos that are decorated with use_cassette... #103

Closed

Add global toggle #104

Closed

Before record response #105

Closed

Check for old style class when building subclass.

5edc58f

colonelpanic8 force-pushed the fix_CassetteContextDecorator_nesting_issues branch from 2442115 to 5edc58f Compare September 18, 2014 14:10

hasattr check for requests 2.0 use cassette added type for httplib2 d…

e1e08c7

…ictionary patch.

Refactor build_patchers into class. Fix issue with patching non exist…

4868a63

…ent attribute with hasattr.

colonelpanic8 force-pushed the fix_CassetteContextDecorator_nesting_issues branch from 76c185e to 4868a63 Compare September 18, 2014 21:43

colonelpanic8 added 2 commits September 18, 2014 15:25

Use contextdecorator from contextlib2. add logging for entering context.

0c19acd

Add test that fails because of the fact that a new class is used for …

58fcb2b

…each cassette context instead of replacing the cassette on the existing mock connection.

colonelpanic8 mentioned this pull request Sep 18, 2014

Session created while cassette is active is still attached to cassette when context manager exits #109

Closed

colonelpanic8 added 2 commits September 18, 2014 17:01

Fixed issue in test_nested_context_managers_with_session_created_befo…

2bf23b2

…re_first_nesting. by using a single class and patching cassette on that class. Not a great solution :\

Add failing test for session still being attached to cassette after c…

8947f0f

…ontext is gone.

colonelpanic8 added 2 commits September 19, 2014 14:31

Use {[testenv]deps}, instead of repeating testing requirements. Write…

b6e9602

… another failing test for kevin1024#109

Revert "Fixed issue in test_nested_context_managers_with_session_crea…

1018867

…ted_before_first_nesting. by using a single class and patching cassette on that class. Not a great solution :\" This reverts commit 2bf23b2.

colonelpanic8 added 3 commits September 19, 2014 17:06

Fix some of the issues from kevin1024#109

b1cdd50

Mark bad test xfail.

121ed79

Remove ConnectionRemover class that tried to get rid of vcr connectio…

dc249b0

…ns in ConnectionPools.

colonelpanic8 force-pushed the fix_CassetteContextDecorator_nesting_issues branch from 9d54e96 to 2fd21e4 Compare September 20, 2014 17:55

Make changes from b1cdd50 compatible with requests1.x; Update Readme.…

83211a1

…md with description of `before_record_response`

colonelpanic8 force-pushed the fix_CassetteContextDecorator_nesting_issues branch from 2fd21e4 to 83211a1 Compare September 20, 2014 18:07

colonelpanic8 added 4 commits September 20, 2014 11:28

Return a tuple from the _request function on CassettePatcherBuilder e…

18e5898

…ven if import fails. Make _recursively_apply_get_cassette_subclass actually work with dictionaries.

Revert "Remove ConnectionRemover class that tried to get rid of vcr c…

757ad9c

…onnections in ConnectionPools." This reverts commit dc249b0. Conflicts: vcr/patch.py

Fix last bit of of kevin1024#109.

a2c947d

Bump setup.py version to v1.1.0. minor tweaks to readme.

113c95f

colonelpanic8 force-pushed the fix_CassetteContextDecorator_nesting_issues branch from 55f3fa3 to 113c95f Compare September 21, 2014 12:16

colonelpanic8 added a commit that referenced this pull request Sep 21, 2014

Merge pull request #108 from IvanMalison/fix_CassetteContextDecorator…

3dea853

…_nesting_issues Fix cassette context decorator nesting issues

colonelpanic8 merged commit 3dea853 into kevin1024:master Sep 21, 2014

colonelpanic8 deleted the fix_CassetteContextDecorator_nesting_issues branch September 21, 2014 12:35

colonelpanic8 mentioned this pull request Sep 22, 2014

Nesting CassetteContextDecorators does not work properly #107

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix cassette context decorator nesting issues #108

Fix cassette context decorator nesting issues #108

colonelpanic8 commented Sep 18, 2014

colonelpanic8 commented Sep 18, 2014

colonelpanic8 commented Sep 19, 2014

kevin1024 commented Sep 19, 2014

colonelpanic8 commented Sep 19, 2014

colonelpanic8 commented Sep 19, 2014

kevin1024 commented Sep 19, 2014

colonelpanic8 commented Sep 19, 2014

kevin1024 commented Sep 19, 2014

colonelpanic8 commented Sep 19, 2014

kevin1024 commented Sep 19, 2014

colonelpanic8 commented Sep 21, 2014

kevin1024 commented Sep 21, 2014

Fix cassette context decorator nesting issues #108

Fix cassette context decorator nesting issues #108

Conversation

colonelpanic8 commented Sep 18, 2014

colonelpanic8 commented Sep 18, 2014

colonelpanic8 commented Sep 19, 2014

kevin1024 commented Sep 19, 2014

colonelpanic8 commented Sep 19, 2014

colonelpanic8 commented Sep 19, 2014

kevin1024 commented Sep 19, 2014

colonelpanic8 commented Sep 19, 2014

kevin1024 commented Sep 19, 2014

colonelpanic8 commented Sep 19, 2014

kevin1024 commented Sep 19, 2014

colonelpanic8 commented Sep 21, 2014

kevin1024 commented Sep 21, 2014