Remove pytest warnings

3 files changed, 27 insertions, 11 deletions

diff --git a/test/test_buffer.py b/test/test_buffer.py
index 87f359f..d723e8d 100644
--- a/test/test_buffer.py
+++ b/test/test_buffer.py
@@ -7,7 +7,10 @@ from msgpack import packb, unpackb
 def test_unpack_buffer():
     from array import array
     buf = array('b')
-    buf.fromstring(packb((b'foo', b'bar')))
+    try:
+        buf.frombytes(packb((b'foo', b'bar')))
+    except AttributeError:  # PY2
+        buf.fromstring(packb((b'foo', b'bar')))
     obj = unpackb(buf, use_list=1)
     assert [b'foo', b'bar'] == obj
 
diff --git a/test/test_extension.py b/test/test_extension.py
index d05d7ab..8aa0cbb 100644
--- a/test/test_extension.py
+++ b/test/test_extension.py
@@ -40,7 +40,10 @@ def test_extension_type():
         print('default called', obj)
         if isinstance(obj, array.array):
             typecode = 123 # application specific typecode
-            data = obj.tostring()
+            try:
+                data = obj.tobytes()
+            except AttributeError:
+                data = obj.tostring()
             return ExtType(typecode, data)
         raise TypeError("Unknown type object %r" % (obj,))
 
@@ -48,7 +51,10 @@ def test_extension_type():
         print('ext_hook called', code, data)
         assert code == 123
         obj = array.array('d')
-        obj.fromstring(data)
+        try:
+            obj.frombytes(data)
+        except AttributeError:  # PY2
+            obj.fromstring(data)
         return obj
 
     obj = [42, b'hello', array.array('d', [1.1, 2.2, 3.3])]
diff --git a/test/test_pack.py b/test/test_pack.py
index 4608083..3658a97 100644
--- a/test/test_pack.py
+++ b/test/test_pack.py
@@ -2,13 +2,15 @@
 # coding: utf-8
 from __future__ import absolute_import, division, print_function, unicode_literals
 
+from collections import OrderedDict
+from io import BytesIO
 import struct
+
+import pytest
 from pytest import raises, xfail
 
 from msgpack import packb, unpackb, Unpacker, Packer, pack
 
-from collections import OrderedDict
-from io import BytesIO
 
 def check(data, use_list=False):
     re = unpackb(packb(data), use_list=use_list)
@@ -47,7 +49,8 @@ def testPackUTF32():  # deprecated
             "Русский текст",
             ]
         for td in test_data:
-            re = unpackb(packb(td, encoding='utf-32'), use_list=1, encoding='utf-32')
+            with pytest.deprecated_call():
+                re = unpackb(packb(td, encoding='utf-32'), use_list=1, encoding='utf-32')
             assert re == td
     except LookupError as e:
         xfail(e)
@@ -67,19 +70,23 @@ def testPackByteArrays():
         check(td)
 
 def testIgnoreUnicodeErrors(): # deprecated
-    re = unpackb(packb(b'abc\xeddef'), encoding='utf-8', unicode_errors='ignore', use_list=1)
+    with pytest.deprecated_call():
+        re = unpackb(packb(b'abc\xeddef'), encoding='utf-8', unicode_errors='ignore', use_list=1)
     assert re == "abcdef"
 
 def testStrictUnicodeUnpack():
-    with raises(UnicodeDecodeError):
-        unpackb(packb(b'abc\xeddef'), raw=False, use_list=1)
+    packed = packb(b'abc\xeddef')
+    with pytest.raises(UnicodeDecodeError):
+        unpackb(packed, raw=False, use_list=1)
 
 def testStrictUnicodePack():  # deprecated
     with raises(UnicodeEncodeError):
-        packb("abc\xeddef", encoding='ascii', unicode_errors='strict')
+        with pytest.deprecated_call():
+            packb("abc\xeddef", encoding='ascii', unicode_errors='strict')
 
 def testIgnoreErrorsPack():  # deprecated
-    re = unpackb(packb("abcФФФdef", encoding='ascii', unicode_errors='ignore'), raw=False, use_list=1)
+    with pytest.deprecated_call():
+        re = unpackb(packb("abcФФФdef", encoding='ascii', unicode_errors='ignore'), raw=False, use_list=1)
     assert re == "abcdef"
 
 def testDecodeBinary():