Rooba
/
kombu
mirror of https://github.com/celery/kombu.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

unittest assertEquals is deprecated

This commit is contained in:
Ask Solem 2011-09-16 15:37:00 +01:00
parent 5f28693b4b
commit a7d02b82e3
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/release/jython-run-tests Executable file
View File

@ -0,0 +1,8 @@
#!/bin/bash
base=${1:-.}
nosetests --with-xunit \
--xunit-file="$base/nosetests.xml"
# coverage doesn't with with jython
echo "<coverage />" > "$base/coverage.html"
mkdir -p "$base/cover"
touch "$base/cover/index.html"

30
kombu/tests/test_serialization.py
View File

@ -64,12 +64,12 @@ def say(m):
class test_Serialization(unittest.TestCase):
def test_content_type_decoding(self):
self.assertEquals(unicode_string,
self.assertEqual(unicode_string,
registry.decode(
unicode_string_as_utf8,
content_type='plain/text',
content_encoding='utf-8'))
self.assertEquals(latin_string,
self.assertEqual(latin_string,
registry.decode(
latin_string_as_latin1,
content_type='application/data',
@ -81,7 +81,7 @@ class test_Serialization(unittest.TestCase):
content_encoding='binary'),
bytes_type)
self.assertEquals(unicode_string_as_utf8,
self.assertEqual(unicode_string_as_utf8,
registry.decode(
unicode_string_as_utf8,
content_type='application/data',
@ -89,28 +89,28 @@ class test_Serialization(unittest.TestCase):
def test_content_type_encoding(self):
# Using the "raw" serializer
self.assertEquals(unicode_string_as_utf8,
self.assertEqual(unicode_string_as_utf8,
registry.encode(
unicode_string, serializer="raw")[-1])
self.assertEquals(latin_string_as_utf8,
self.assertEqual(latin_string_as_utf8,
registry.encode(
latin_string, serializer="raw")[-1])
# And again w/o a specific serializer to check the
# code where we force unicode objects into a string.
self.assertEquals(unicode_string_as_utf8,
self.assertEqual(unicode_string_as_utf8,
registry.encode(unicode_string)[-1])
self.assertEquals(latin_string_as_utf8,
self.assertEqual(latin_string_as_utf8,
registry.encode(latin_string)[-1])
def test_json_decode(self):
self.assertEquals(py_data,
self.assertEqual(py_data,
registry.decode(
json_data,
content_type='application/json',
content_encoding='utf-8'))
def test_json_encode(self):
self.assertEquals(registry.decode(
self.assertEqual(registry.decode(
registry.encode(py_data, serializer="json")[-1],
content_type='application/json',
content_encoding='utf-8'),
@ -122,7 +122,7 @@ class test_Serialization(unittest.TestCase):
@skip_if_not_module('msgpack')
def test_msgpack_decode(self):
register_msgpack()
self.assertEquals(msgpack_py_data,
self.assertEqual(msgpack_py_data,
registry.decode(
msgpack_data,
content_type='application/x-msgpack',
@ -131,7 +131,7 @@ class test_Serialization(unittest.TestCase):
@skip_if_not_module('msgpack')
def test_msgpack_encode(self):
register_msgpack()
self.assertEquals(registry.decode(
self.assertEqual(registry.decode(
registry.encode(msgpack_py_data, serializer="msgpack")[-1],
content_type='application/x-msgpack',
content_encoding='binary'),
@ -143,7 +143,7 @@ class test_Serialization(unittest.TestCase):
@skip_if_not_module('yaml')
def test_yaml_decode(self):
register_yaml()
self.assertEquals(py_data,
self.assertEqual(py_data,
registry.decode(
yaml_data,
content_type='application/x-yaml',
@ -152,7 +152,7 @@ class test_Serialization(unittest.TestCase):
@skip_if_not_module('yaml')
def test_yaml_encode(self):
register_yaml()
self.assertEquals(registry.decode(
self.assertEqual(registry.decode(
registry.encode(py_data, serializer="yaml")[-1],
content_type='application/x-yaml',
content_encoding='utf-8'),
@ -162,14 +162,14 @@ class test_Serialization(unittest.TestCase):
content_encoding='utf-8'))
def test_pickle_decode(self):
self.assertEquals(py_data,
self.assertEqual(py_data,
registry.decode(
pickle_data,
content_type='application/x-python-serialize',
content_encoding='binary'))
def test_pickle_encode(self):
self.assertEquals(pickle_data,
self.assertEquaEqual(pickle_data,
registry.encode(py_data,
serializer="pickle")[-1])