- From 01474bf64e0434881059a3638abff5bb62eaedb1 Mon Sep 17 00:00:00 2001

- From: Scott Moser <smoser@brickies.net>

- Date: Tue, 24 Jan 2017 12:30:47 -0500

- Subject: [PATCH] Call reset from setUp and tearDown in addition to enable and

-  disable.

- 

- When decorating a class via setUp and tearDown, reset() was not being

- called.  That was an unintentional change in behavior from previous versions.

- 

- Addresses #316.

- ---

-  httpretty/core.py | 2 ++

-  1 file changed, 2 insertions(+)

- 

- diff --git a/httpretty/core.py b/httpretty/core.py

- index 4f72678..25df1fd 100644

- --- a/httpretty/core.py

- +++ b/httpretty/core.py

- @@ -1580,6 +1580,7 @@ def httprettified(test):

-                            else None)

-  

-          def new_setUp(self):

- +            httpretty.reset()

-              httpretty.enable()

-              if use_addCleanup:

-                  self.addCleanup(httpretty.disable)

- @@ -1594,6 +1595,7 @@ def httprettified(test):

-  

-              def new_tearDown(self):

-                  httpretty.disable()

- +                httpretty.reset()

-                  if original_tearDown:

-                      original_tearDown(self)

-              klass.tearDown = new_tearDown

- -- 

- 2.9.3

- 

- From 5d2f8d99c28519fe0cf47ebf5f043928d422b757 Mon Sep 17 00:00:00 2001

- From: Adam Williamson <awilliam@redhat.com>

- Date: Fri, 6 Jan 2017 17:56:43 -0800

- Subject: [PATCH] Handle bugs in older urllib3 versions in one of the tests

- 

- Older urllib3 versions had a bug where they lower-cased header

- names (in response header dicts). That makes one of our tests

- fail with older urllib3, because the test expects a 'Server'

- header. As this isn't our fault at all, just have the test cope

- with it by checking if the header dict has a 'server' key and

- replacing it with a 'Server' key with the same value.

- 

- urllib3 1.10 also had a bug when you called dict() on its

- HTTPHeaderDict class; it would turn this:

- 

- {'headername': 'value'}

- 

- Into this:

- 

- {'headername': ['headername', 'value']}

- 

- That was fixed in 1.11, but RHEL 6 still has 1.10, so let's

- work with that by doing dict(headerdict.items()) instead of

- just dict(headerdict) (when we're recording the calls).

- ---

-  httpretty/core.py                 | 7 ++++++-

-  tests/functional/test_requests.py | 5 +++++

-  2 files changed, 11 insertions(+), 1 deletion(-)

- 

- diff --git a/httpretty/core.py b/httpretty/core.py

- index 34d1ed1..0c2d334 100644

- --- a/httpretty/core.py

- +++ b/httpretty/core.py

- @@ -971,7 +971,12 @@ class httpretty(HttpBaseClass):

-                  'response': {

-                      'status': response.status,

-                      'body': decode_utf8(response.data),

- -                    'headers': dict(response.headers)

- +                    # urllib3 1.10 had a bug if you just did:

- +                    # dict(response.headers)

- +                    # which would cause all the values to become lists

- +                    # with the header name as the first item and the

- +                    # true value as the second item. Workaround that

- +                    'headers': dict(response.headers.items())

-                  }

-              })

-              cls.enable()

- diff --git a/tests/functional/test_requests.py b/tests/functional/test_requests.py

- index 4e2063e..18c89f8 100644

- --- a/tests/functional/test_requests.py

- +++ b/tests/functional/test_requests.py

- @@ -742,6 +742,11 @@ def test_recording_calls(port):

-      response['response'].should.have.key("status").being.equal(200)

-      response['response'].should.have.key("body").being.an(text_type)

-      response['response'].should.have.key("headers").being.a(dict)

- +    # older urllib3 had a bug where header keys were lower-cased:

- +    # https://github.com/shazow/urllib3/issues/236

- +    # cope with that

- +    if 'server' in response['response']["headers"]:

- +        response['response']["headers"]["Server"] = response['response']["headers"].pop("server")

-      response['response']["headers"].should.have.key("Server").being.equal("TornadoServer/" + tornado_version)

-  

-      # And When I playback the previously recorded calls

- -- 

- 2.11.0

- 

- -    # And that it's bound to some host and port

- -    socket.connect(('somewhere.com', 80))

- +        # And that it's bound to some host and port

- +        socket.connect(('somewhere.com', 80))

- %if 0%{?fedora} || 0%{?rhel} > 7

- # escaping for EPEL.

- %global with_python3 1

- %global modname         httpretty

- Version:        0.9.5

- Release:        3%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}

- URL:            http://falcao.it/HTTPretty/

- Source0:        https://files.pythonhosted.org/packages/source/h/httpretty/httpretty-%{version}.tar.gz

- Patch2:         python-httpretty-fakesock_getpeercert_noconnect.patch

- 

- # Fix a couple of issues with urllib 1.10 (as found in RHEL 6)

- # https://github.com/gabrielfalcao/HTTPretty/pull/315

- Patch3:         0001-Handle-bugs-in-older-urllib3-versions-in-one-of-the-.patch

- 

- # Fix setUp and tearDown not calling reset

- # https://github.com/gabrielfalcao/HTTPretty/pull/317

- Patch4:         0001-Call-reset-from-setUp-and-tearDown-in-addition-to-en.patch

- BuildRequires:  python2-devel

- BuildRequires:  python2-setuptools

- # For tests

- BuildRequires:  python2-httplib2

- BuildRequires:  python2-mock

- BuildRequires:  python2-nose

- BuildRequires:  python2-requests

- BuildRequires:  python2-sure

- BuildRequires:  python2-urllib3

- BuildRequires:  python2-tornado

- %if 0%{?epel} == 6

- # Need unittest2 to get the 'skip' decorator

- BuildRequires:  python-unittest2

- %endif

- 

- Requires:       python2-six

- %if 0%{?with_python3}

- Requires:       python3-six

- BuildRequires:  python3-devel

- BuildRequires:  python3-setuptools

- BuildRequires:  python3-httplib2

- BuildRequires:  python3-mock

- BuildRequires:  python3-nose

- BuildRequires:  python3-requests

- BuildRequires:  python3-sure

- BuildRequires:  python3-urllib3

- BuildRequires:  python3-tornado

- LANG=en_US.UTF-8 %py2_build

- %if 0%{?with_python3}

- LANG=en_US.UTF-8 %py3_build

- rm -rf $RPM_BUILD_ROOT

- LANG=en_US.UTF-8 %py2_install

- %if 0%{?with_python3}

- LANG=en_US.UTF-8 %py3_install

- LANG=en_US.UTF-8 %{__python2} -m nose -v

- %if 0%{?with_python3}

- LANG=en_US.UTF-8 %{__python3} -m nose -v

- %if 0%{?with_python3}

- SHA512 (httpretty-0.9.5.tar.gz) = 21c3e8f39796c426952056a8248934ac56f185b3a0ca016579f0717e2230bf0763c331d2f522a248fff7a3d36be3fa929d24fba636e13281230c02c8ba25659c