--- a/contrib/python-zstandard/tests/test_buffer_util.py Fri Dec 27 18:54:57 2019 -0500
+++ b/contrib/python-zstandard/tests/test_buffer_util.py Sat Dec 28 09:55:45 2019 -0800
@@ -3,104 +3,114 @@
import zstandard as zstd
-ss = struct.Struct('=QQ')
+from .common import TestCase
+
+ss = struct.Struct("=QQ")
-class TestBufferWithSegments(unittest.TestCase):
+class TestBufferWithSegments(TestCase):
def test_arguments(self):
- if not hasattr(zstd, 'BufferWithSegments'):
- self.skipTest('BufferWithSegments not available')
+ if not hasattr(zstd, "BufferWithSegments"):
+ self.skipTest("BufferWithSegments not available")
with self.assertRaises(TypeError):
zstd.BufferWithSegments()
with self.assertRaises(TypeError):
- zstd.BufferWithSegments(b'foo')
+ zstd.BufferWithSegments(b"foo")
# Segments data should be a multiple of 16.
- with self.assertRaisesRegexp(ValueError, 'segments array size is not a multiple of 16'):
- zstd.BufferWithSegments(b'foo', b'\x00\x00')
+ with self.assertRaisesRegex(
+ ValueError, "segments array size is not a multiple of 16"
+ ):
+ zstd.BufferWithSegments(b"foo", b"\x00\x00")
def test_invalid_offset(self):
- if not hasattr(zstd, 'BufferWithSegments'):
- self.skipTest('BufferWithSegments not available')
+ if not hasattr(zstd, "BufferWithSegments"):
+ self.skipTest("BufferWithSegments not available")
- with self.assertRaisesRegexp(ValueError, 'offset within segments array references memory'):
- zstd.BufferWithSegments(b'foo', ss.pack(0, 4))
+ with self.assertRaisesRegex(
+ ValueError, "offset within segments array references memory"
+ ):
+ zstd.BufferWithSegments(b"foo", ss.pack(0, 4))
def test_invalid_getitem(self):
- if not hasattr(zstd, 'BufferWithSegments'):
- self.skipTest('BufferWithSegments not available')
+ if not hasattr(zstd, "BufferWithSegments"):
+ self.skipTest("BufferWithSegments not available")
- b = zstd.BufferWithSegments(b'foo', ss.pack(0, 3))
+ b = zstd.BufferWithSegments(b"foo", ss.pack(0, 3))
- with self.assertRaisesRegexp(IndexError, 'offset must be non-negative'):
+ with self.assertRaisesRegex(IndexError, "offset must be non-negative"):
test = b[-10]
- with self.assertRaisesRegexp(IndexError, 'offset must be less than 1'):
+ with self.assertRaisesRegex(IndexError, "offset must be less than 1"):
test = b[1]
- with self.assertRaisesRegexp(IndexError, 'offset must be less than 1'):
+ with self.assertRaisesRegex(IndexError, "offset must be less than 1"):
test = b[2]
def test_single(self):
- if not hasattr(zstd, 'BufferWithSegments'):
- self.skipTest('BufferWithSegments not available')
+ if not hasattr(zstd, "BufferWithSegments"):
+ self.skipTest("BufferWithSegments not available")
- b = zstd.BufferWithSegments(b'foo', ss.pack(0, 3))
+ b = zstd.BufferWithSegments(b"foo", ss.pack(0, 3))
self.assertEqual(len(b), 1)
self.assertEqual(b.size, 3)
- self.assertEqual(b.tobytes(), b'foo')
+ self.assertEqual(b.tobytes(), b"foo")
self.assertEqual(len(b[0]), 3)
self.assertEqual(b[0].offset, 0)
- self.assertEqual(b[0].tobytes(), b'foo')
+ self.assertEqual(b[0].tobytes(), b"foo")
def test_multiple(self):
- if not hasattr(zstd, 'BufferWithSegments'):
- self.skipTest('BufferWithSegments not available')
+ if not hasattr(zstd, "BufferWithSegments"):
+ self.skipTest("BufferWithSegments not available")
- b = zstd.BufferWithSegments(b'foofooxfooxy', b''.join([ss.pack(0, 3),
- ss.pack(3, 4),
- ss.pack(7, 5)]))
+ b = zstd.BufferWithSegments(
+ b"foofooxfooxy", b"".join([ss.pack(0, 3), ss.pack(3, 4), ss.pack(7, 5)])
+ )
self.assertEqual(len(b), 3)
self.assertEqual(b.size, 12)
- self.assertEqual(b.tobytes(), b'foofooxfooxy')
+ self.assertEqual(b.tobytes(), b"foofooxfooxy")
- self.assertEqual(b[0].tobytes(), b'foo')
- self.assertEqual(b[1].tobytes(), b'foox')
- self.assertEqual(b[2].tobytes(), b'fooxy')
+ self.assertEqual(b[0].tobytes(), b"foo")
+ self.assertEqual(b[1].tobytes(), b"foox")
+ self.assertEqual(b[2].tobytes(), b"fooxy")
-class TestBufferWithSegmentsCollection(unittest.TestCase):
+class TestBufferWithSegmentsCollection(TestCase):
def test_empty_constructor(self):
- if not hasattr(zstd, 'BufferWithSegmentsCollection'):
- self.skipTest('BufferWithSegmentsCollection not available')
+ if not hasattr(zstd, "BufferWithSegmentsCollection"):
+ self.skipTest("BufferWithSegmentsCollection not available")
- with self.assertRaisesRegexp(ValueError, 'must pass at least 1 argument'):
+ with self.assertRaisesRegex(ValueError, "must pass at least 1 argument"):
zstd.BufferWithSegmentsCollection()
def test_argument_validation(self):
- if not hasattr(zstd, 'BufferWithSegmentsCollection'):
- self.skipTest('BufferWithSegmentsCollection not available')
+ if not hasattr(zstd, "BufferWithSegmentsCollection"):
+ self.skipTest("BufferWithSegmentsCollection not available")
- with self.assertRaisesRegexp(TypeError, 'arguments must be BufferWithSegments'):
+ with self.assertRaisesRegex(TypeError, "arguments must be BufferWithSegments"):
zstd.BufferWithSegmentsCollection(None)
- with self.assertRaisesRegexp(TypeError, 'arguments must be BufferWithSegments'):
- zstd.BufferWithSegmentsCollection(zstd.BufferWithSegments(b'foo', ss.pack(0, 3)),
- None)
+ with self.assertRaisesRegex(TypeError, "arguments must be BufferWithSegments"):
+ zstd.BufferWithSegmentsCollection(
+ zstd.BufferWithSegments(b"foo", ss.pack(0, 3)), None
+ )
- with self.assertRaisesRegexp(ValueError, 'ZstdBufferWithSegments cannot be empty'):
- zstd.BufferWithSegmentsCollection(zstd.BufferWithSegments(b'', b''))
+ with self.assertRaisesRegex(
+ ValueError, "ZstdBufferWithSegments cannot be empty"
+ ):
+ zstd.BufferWithSegmentsCollection(zstd.BufferWithSegments(b"", b""))
def test_length(self):
- if not hasattr(zstd, 'BufferWithSegmentsCollection'):
- self.skipTest('BufferWithSegmentsCollection not available')
+ if not hasattr(zstd, "BufferWithSegmentsCollection"):
+ self.skipTest("BufferWithSegmentsCollection not available")
- b1 = zstd.BufferWithSegments(b'foo', ss.pack(0, 3))
- b2 = zstd.BufferWithSegments(b'barbaz', b''.join([ss.pack(0, 3),
- ss.pack(3, 3)]))
+ b1 = zstd.BufferWithSegments(b"foo", ss.pack(0, 3))
+ b2 = zstd.BufferWithSegments(
+ b"barbaz", b"".join([ss.pack(0, 3), ss.pack(3, 3)])
+ )
c = zstd.BufferWithSegmentsCollection(b1)
self.assertEqual(len(c), 1)
@@ -115,21 +125,22 @@
self.assertEqual(c.size(), 9)
def test_getitem(self):
- if not hasattr(zstd, 'BufferWithSegmentsCollection'):
- self.skipTest('BufferWithSegmentsCollection not available')
+ if not hasattr(zstd, "BufferWithSegmentsCollection"):
+ self.skipTest("BufferWithSegmentsCollection not available")
- b1 = zstd.BufferWithSegments(b'foo', ss.pack(0, 3))
- b2 = zstd.BufferWithSegments(b'barbaz', b''.join([ss.pack(0, 3),
- ss.pack(3, 3)]))
+ b1 = zstd.BufferWithSegments(b"foo", ss.pack(0, 3))
+ b2 = zstd.BufferWithSegments(
+ b"barbaz", b"".join([ss.pack(0, 3), ss.pack(3, 3)])
+ )
c = zstd.BufferWithSegmentsCollection(b1, b2)
- with self.assertRaisesRegexp(IndexError, 'offset must be less than 3'):
+ with self.assertRaisesRegex(IndexError, "offset must be less than 3"):
c[3]
- with self.assertRaisesRegexp(IndexError, 'offset must be less than 3'):
+ with self.assertRaisesRegex(IndexError, "offset must be less than 3"):
c[4]
- self.assertEqual(c[0].tobytes(), b'foo')
- self.assertEqual(c[1].tobytes(), b'bar')
- self.assertEqual(c[2].tobytes(), b'baz')
+ self.assertEqual(c[0].tobytes(), b"foo")
+ self.assertEqual(c[1].tobytes(), b"bar")
+ self.assertEqual(c[2].tobytes(), b"baz")