From fe0ed63c4a3486402f65638b476149ebba752055 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 8 Feb 2016 04:16:58 +0100 Subject: add Serializable ABC --- test/http/test_headers.py | 2 +- test/http/test_request.py | 2 +- test/http/test_response.py | 2 +- test/test_odict.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/http/test_headers.py b/test/http/test_headers.py index 8bddc0b2..d50fee3e 100644 --- a/test/http/test_headers.py +++ b/test/http/test_headers.py @@ -148,5 +148,5 @@ class TestHeaders(object): headers2 = Headers() assert headers != headers2 - headers2.load_state(headers.get_state()) + headers2.set_state(headers.get_state()) assert headers == headers2 diff --git a/test/http/test_request.py b/test/http/test_request.py index 8cf69ffe..1deee387 100644 --- a/test/http/test_request.py +++ b/test/http/test_request.py @@ -12,7 +12,7 @@ from .test_message import _test_decoded_attr, _test_passthrough_attr class TestRequestData(object): def test_init(self): - with raises(AssertionError): + with raises(ValueError): treq(headers="foobar") assert isinstance(treq(headers=None).headers, Headers) diff --git a/test/http/test_response.py b/test/http/test_response.py index a1f4abd7..c7d90b16 100644 --- a/test/http/test_response.py +++ b/test/http/test_response.py @@ -8,7 +8,7 @@ from .test_message import _test_passthrough_attr, _test_decoded_attr class TestResponseData(object): def test_init(self): - with raises(AssertionError): + with raises(ValueError): tresp(headers="foobar") assert isinstance(tresp(headers=None).headers, Headers) diff --git a/test/test_odict.py b/test/test_odict.py index 88197026..f0985ef6 100644 --- a/test/test_odict.py +++ b/test/test_odict.py @@ -24,7 +24,7 @@ class TestODict(object): nd = odict.ODict.from_state(state) assert nd == od b = odict.ODict() - b.load_state(state) + b.set_state(state) assert b == od def test_in_any(self): -- cgit v1.2.3 From 173ff0b235cdb45a8923f313807d9804830c2a2b Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 8 Feb 2016 04:28:49 +0100 Subject: fix py3 compat --- test/http/test_request.py | 2 +- test/http/test_response.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/http/test_request.py b/test/http/test_request.py index 1deee387..900b2cd1 100644 --- a/test/http/test_request.py +++ b/test/http/test_request.py @@ -12,7 +12,7 @@ from .test_message import _test_decoded_attr, _test_passthrough_attr class TestRequestData(object): def test_init(self): - with raises(ValueError): + with raises(ValueError if six.PY2 else TypeError): treq(headers="foobar") assert isinstance(treq(headers=None).headers, Headers) diff --git a/test/http/test_response.py b/test/http/test_response.py index c7d90b16..14588000 100644 --- a/test/http/test_response.py +++ b/test/http/test_response.py @@ -1,5 +1,7 @@ from __future__ import absolute_import, print_function, division +import six + from netlib.http import Headers from netlib.odict import ODict, ODictCaseless from netlib.tutils import raises, tresp @@ -8,7 +10,7 @@ from .test_message import _test_passthrough_attr, _test_decoded_attr class TestResponseData(object): def test_init(self): - with raises(ValueError): + with raises(ValueError if six.PY2 else TypeError): tresp(headers="foobar") assert isinstance(tresp(headers=None).headers, Headers) -- cgit v1.2.3