projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 7490-datamanager-dont-die-return-error
[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 15257fe31270e8d3614ba44e02637c3fbf7c3691..6c3bd61414173fb64fe9ef7b7b1b44dcc4af6d9d 100644
(file)
--- a/
sdk/python/tests/test_stream.py
+++ b/
sdk/python/tests/test_stream.py
@@
-21,7
+21,7
@@
class StreamFileReaderTestCase(unittest.TestCase):
return StreamFileReader(stream, [Range(1, 0, 3), Range(6, 3, 3), Range(11, 6, 3)],
'count.txt')
return StreamFileReader(stream, [Range(1, 0, 3), Range(6, 3, 3), Range(11, 6, 3)],
'count.txt')
- def test_read_
returns_first_block
(self):
+ def test_read_
block_crossing_behavior
(self):
# read() calls will be aligned on block boundaries - see #3663.
sfile = self.make_count_reader()
self.assertEqual('123', sfile.read(10))
# read() calls will be aligned on block boundaries - see #3663.
sfile = self.make_count_reader()
self.assertEqual('123', sfile.read(10))
@@
-48,7
+48,7
@@
class StreamFileReaderTestCase(unittest.TestCase):
self.assertEqual('123456789', ''.join(sfile.readall()))
def test_one_arg_seek(self):
self.assertEqual('123456789', ''.join(sfile.readall()))
def test_one_arg_seek(self):
- self.test_
relativ
e_seek([])
+ self.test_
absolut
e_seek([])
def test_absolute_seek(self, args=[os.SEEK_SET]):
sfile = self.make_count_reader()
def test_absolute_seek(self, args=[os.SEEK_SET]):
sfile = self.make_count_reader()
@@
-199,47
+199,47
@@
class StreamRetryTestMixin(object):
@tutil.skip_sleep
def test_success_without_retries(self):
@tutil.skip_sleep
def test_success_without_retries(self):
- with tutil.mock_
get
_responses('bar', 200):
+ with tutil.mock_
keep
_responses('bar', 200):
reader = self.reader_for('bar_file')
self.assertEqual('bar', self.read_for_test(reader, 3))
@tutil.skip_sleep
def test_read_no_default_retry(self):
reader = self.reader_for('bar_file')
self.assertEqual('bar', self.read_for_test(reader, 3))
@tutil.skip_sleep
def test_read_no_default_retry(self):
- with tutil.mock_
get
_responses('', 500):
+ with tutil.mock_
keep
_responses('', 500):
reader = self.reader_for('user_agreement')
with self.assertRaises(arvados.errors.KeepReadError):
self.read_for_test(reader, 10)
@tutil.skip_sleep
def test_read_with_instance_retries(self):
reader = self.reader_for('user_agreement')
with self.assertRaises(arvados.errors.KeepReadError):
self.read_for_test(reader, 10)
@tutil.skip_sleep
def test_read_with_instance_retries(self):
- with tutil.mock_
get
_responses('foo', 500, 200):
+ with tutil.mock_
keep
_responses('foo', 500, 200):
reader = self.reader_for('foo_file', num_retries=3)
self.assertEqual('foo', self.read_for_test(reader, 3))
@tutil.skip_sleep
def test_read_with_method_retries(self):
reader = self.reader_for('foo_file', num_retries=3)
self.assertEqual('foo', self.read_for_test(reader, 3))
@tutil.skip_sleep
def test_read_with_method_retries(self):
- with tutil.mock_
get
_responses('foo', 500, 200):
+ with tutil.mock_
keep
_responses('foo', 500, 200):
reader = self.reader_for('foo_file')
self.assertEqual('foo',
self.read_for_test(reader, 3, num_retries=3))
@tutil.skip_sleep
def test_read_instance_retries_exhausted(self):
reader = self.reader_for('foo_file')
self.assertEqual('foo',
self.read_for_test(reader, 3, num_retries=3))
@tutil.skip_sleep
def test_read_instance_retries_exhausted(self):
- with tutil.mock_
get
_responses('bar', 500, 500, 500, 500, 200):
+ with tutil.mock_
keep
_responses('bar', 500, 500, 500, 500, 200):
reader = self.reader_for('bar_file', num_retries=3)
with self.assertRaises(arvados.errors.KeepReadError):
self.read_for_test(reader, 3)
@tutil.skip_sleep
def test_read_method_retries_exhausted(self):
reader = self.reader_for('bar_file', num_retries=3)
with self.assertRaises(arvados.errors.KeepReadError):
self.read_for_test(reader, 3)
@tutil.skip_sleep
def test_read_method_retries_exhausted(self):
- with tutil.mock_
get
_responses('bar', 500, 500, 500, 500, 200):
+ with tutil.mock_
keep
_responses('bar', 500, 500, 500, 500, 200):
reader = self.reader_for('bar_file')
with self.assertRaises(arvados.errors.KeepReadError):
self.read_for_test(reader, 3, num_retries=3)
@tutil.skip_sleep
def test_method_retries_take_precedence(self):
reader = self.reader_for('bar_file')
with self.assertRaises(arvados.errors.KeepReadError):
self.read_for_test(reader, 3, num_retries=3)
@tutil.skip_sleep
def test_method_retries_take_precedence(self):
- with tutil.mock_
get
_responses('', 500, 500, 500, 200):
+ with tutil.mock_
keep
_responses('', 500, 500, 500, 200):
reader = self.reader_for('user_agreement', num_retries=10)
with self.assertRaises(arvados.errors.KeepReadError):
self.read_for_test(reader, 10, num_retries=1)
reader = self.reader_for('user_agreement', num_retries=10)
with self.assertRaises(arvados.errors.KeepReadError):
self.read_for_test(reader, 10, num_retries=1)