From 9e1b20306919eaa14774befead190ff52df19ba4 Mon Sep 17 00:00:00 2001 From: Dana Powers Date: Wed, 17 Sep 2014 13:49:55 -0700 Subject: Merge conflict w/ assertEqual (assertEquals deprecated) --- test/test_codec.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/test_codec.py') diff --git a/test/test_codec.py b/test/test_codec.py index 0ea1074..2d7670a 100644 --- a/test/test_codec.py +++ b/test/test_codec.py @@ -15,14 +15,14 @@ class TestCodec(unittest.TestCase): for i in xrange(1000): s1 = random_string(100) s2 = gzip_decode(gzip_encode(s1)) - self.assertEquals(s1, s2) + self.assertEqual(s1, s2) @unittest.skipUnless(has_snappy(), "Snappy not available") def test_snappy(self): for i in xrange(1000): s1 = random_string(100) s2 = snappy_decode(snappy_encode(s1)) - self.assertEquals(s1, s2) + self.assertEqual(s1, s2) @unittest.skipUnless(has_snappy(), "Snappy not available") def test_snappy_detect_xerial(self): @@ -53,7 +53,7 @@ class TestCodec(unittest.TestCase): + struct.pack('!i', block_len) + random_snappy \ + struct.pack('!i', block_len2) + random_snappy2 \ - self.assertEquals(snappy_decode(to_test), (b'SNAPPY' * 50) + (b'XERIAL' * 50)) + self.assertEqual(snappy_decode(to_test), (b'SNAPPY' * 50) + (b'XERIAL' * 50)) @unittest.skipUnless(has_snappy(), "Snappy not available") def test_snappy_encode_xerial(self): @@ -68,5 +68,5 @@ class TestCodec(unittest.TestCase): to_test = (b'SNAPPY' * 50) + (b'XERIAL' * 50) compressed = snappy_encode(to_test, xerial_compatible=True, xerial_blocksize=300) - self.assertEquals(compressed, to_ensure) + self.assertEqual(compressed, to_ensure) -- cgit v1.2.1