Mirroring/vcrpy
1
0
Fork 0
mirror of https://github.com/kevin1024/vcrpy.git synced 2025-12-11 10:03:00 +00:00
Code Releases Activity

Merge pull request #244 from jaysonsantos/master

Browse Source 
Avoid concatenating bytes with strings
This commit is contained in:
Kevin McCarthy
2016-04-26 08:59:07 -04:00
parent 4f3c5c0a6e 632af2e41a
commit cfc483a08d
5 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/integration/test_boto.py
View File

@@ -1,12 +1,12 @@
import pytest import pytest
boto = pytest.importorskip("boto") boto = pytest.importorskip("boto")
import boto import boto # NOQA
import boto.iam import boto.iam # NOQA
from boto.s3.connection import S3Connection from boto.s3.connection import S3Connection # NOQA
from boto.s3.key import Key from boto.s3.key import Key # NOQA
from ConfigParser import DuplicateSectionError from ConfigParser import DuplicateSectionError # NOQA
import vcr import vcr # NOQA
def test_boto_stubs(tmpdir): def test_boto_stubs(tmpdir):

16
tests/integration/test_requests.py
View File

@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
'''Test requests' interaction with vcr''' '''Test requests' interaction with vcr'''
import pytest import pytest
import vcr import vcr
from assertions import assert_cassette_empty, assert_is_json from assertions import assert_cassette_empty, assert_is_json
@@ -95,6 +94,21 @@ def test_post(tmpdir, scheme):
assert req1 == req2 assert req1 == req2
def test_post_chunked_binary(tmpdir, scheme):
'''Ensure that we can send chunked binary without breaking while trying to concatenate bytes with str.'''
data1 = iter([b'data', b'to', b'send'])
data2 = iter([b'data', b'to', b'send'])
url = scheme + '://httpbin.org/post'
with vcr.use_cassette(str(tmpdir.join('requests.yaml'))):
req1 = requests.post(url, data1).content
print(req1)
with vcr.use_cassette(str(tmpdir.join('requests.yaml'))):
req2 = requests.post(url, data2).content
assert req1 == req2
def test_redirects(tmpdir, scheme): def test_redirects(tmpdir, scheme):
'''Ensure that we can handle redirects''' '''Ensure that we can handle redirects'''
url = scheme + '://httpbin.org/redirect-to?url=bytes/1024' url = scheme + '://httpbin.org/redirect-to?url=bytes/1024'

2
tests/integration/test_wild.py
View File

@@ -3,7 +3,7 @@ from six.moves import xmlrpc_client
requests = pytest.importorskip("requests") requests = pytest.importorskip("requests")
import vcr import vcr # NOQA
try: try:
import httplib import httplib

3
tests/unit/test_cassettes.py
View File

@@ -233,7 +233,8 @@ def test_cassette_use_called_without_path_uses_function_to_generate_path():
def test_path_transformer_with_function_path(): def test_path_transformer_with_function_path():
path_transformer = lambda path: os.path.join('a', path) def path_transformer(path):
return os.path.join('a', path)
@Cassette.use(inject=True, path_transformer=path_transformer) @Cassette.use(inject=True, path_transformer=path_transformer)
def function_name(cassette): def function_name(cassette):

3
vcr/stubs/__init__.py
View File

@@ -191,7 +191,8 @@ class VCRConnection(object):
body of the request. So if that happens, let's just append the data body of the request. So if that happens, let's just append the data
onto the most recent request in the cassette. onto the most recent request in the cassette.
''' '''
self._vcr_request.body = (self._vcr_request.body or '') + data self._vcr_request.body = self._vcr_request.body + data \
if self._vcr_request.body else data
def close(self): def close(self):
# Note: the real connection will only close if it's open, so # Note: the real connection will only close if it's open, so