projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3198: Fix syntax errors
[arvados.git]
/
sdk
/
python
/
tests
/
test_stream.py
diff --git
a/sdk/python/tests/test_stream.py
b/sdk/python/tests/test_stream.py
index 08a3d28a5d11d79c0752a6030bbc54c5db66b0a5..e246d918dcc21d4004ba171aeab2c14ac4129d8f 100644
(file)
--- a/
sdk/python/tests/test_stream.py
+++ b/
sdk/python/tests/test_stream.py
@@
-6,9
+6,10
@@
import io
import mock
import os
import unittest
import mock
import os
import unittest
+import hashlib
import arvados
import arvados
-from arvados import StreamReader, StreamFileReader
+from arvados import StreamReader, StreamFileReader
, Range
import arvados_testutil as tutil
import run_test_server
import arvados_testutil as tutil
import run_test_server
@@
-16,7
+17,7
@@
import run_test_server
class StreamFileReaderTestCase(unittest.TestCase):
def make_count_reader(self):
stream = tutil.MockStreamReader('.', '01234', '34567', '67890')
class StreamFileReaderTestCase(unittest.TestCase):
def make_count_reader(self):
stream = tutil.MockStreamReader('.', '01234', '34567', '67890')
- return StreamFileReader(stream, [
[1, 3, 0], [6, 3, 3], [11, 3, 6]
],
+ return StreamFileReader(stream, [
Range(1, 0, 3), Range(6, 3, 3), Range(11, 6, 3)
],
'count.txt')
def test_read_returns_first_block(self):
'count.txt')
def test_read_returns_first_block(self):
@@
-102,7
+103,7
@@
class StreamFileReaderTestCase(unittest.TestCase):
def make_newlines_reader(self):
stream = tutil.MockStreamReader('.', 'one\ntwo\n\nth', 'ree\nfour\n\n')
def make_newlines_reader(self):
stream = tutil.MockStreamReader('.', 'one\ntwo\n\nth', 'ree\nfour\n\n')
- return StreamFileReader(stream, [
[0, 11, 0], [11, 10, 11]
], 'count.txt')
+ return StreamFileReader(stream, [
Range(0, 0, 11), Range(11, 11, 10)
], 'count.txt')
def check_lines(self, actual):
self.assertEqual(['one\n', 'two\n', '\n', 'three\n', 'four\n', '\n'],
def check_lines(self, actual):
self.assertEqual(['one\n', 'two\n', '\n', 'three\n', 'four\n', '\n'],
@@
-140,7
+141,7
@@
class StreamFileReaderTestCase(unittest.TestCase):
def test_name_attribute(self):
# Test both .name and .name() (for backward compatibility)
stream = tutil.MockStreamReader()
def test_name_attribute(self):
# Test both .name and .name() (for backward compatibility)
stream = tutil.MockStreamReader()
- sfile = StreamFileReader(stream, [
[0, 0, 0]
], 'nametest')
+ sfile = StreamFileReader(stream, [
Range(0, 0, 0)
], 'nametest')
self.assertEqual('nametest', sfile.name)
self.assertEqual('nametest', sfile.name())
self.assertEqual('nametest', sfile.name)
self.assertEqual('nametest', sfile.name())
@@
-148,7
+149,7
@@
class StreamFileReaderTestCase(unittest.TestCase):
test_text = 'decompression\ntest\n'
test_data = compress_func(test_text)
stream = tutil.MockStreamReader('.', test_data)
test_text = 'decompression\ntest\n'
test_data = compress_func(test_text)
stream = tutil.MockStreamReader('.', test_data)
- reader = StreamFileReader(stream, [
[0, len(test_data), 0]
],
+ reader = StreamFileReader(stream, [
Range(0, 0, len(test_data))
],
'test.' + compress_ext)
self.assertEqual(test_text, ''.join(reader.readall_decompressed()))
'test.' + compress_ext)
self.assertEqual(test_text, ''.join(reader.readall_decompressed()))
@@
-272,6
+273,5
@@
class StreamFileReadlinesTestCase(StreamFileReadTestCase):
def read_for_test(self, reader, byte_count, **kwargs):
return ''.join(reader.readlines(**kwargs))
def read_for_test(self, reader, byte_count, **kwargs):
return ''.join(reader.readlines(**kwargs))
-
if __name__ == '__main__':
unittest.main()
if __name__ == '__main__':
unittest.main()