mirror of
https://github.com/ceph/s3-tests.git
synced 2024-11-21 23:29:47 +00:00
Add close to check for file sizes
This commit is contained in:
parent
d4a77acb71
commit
00cfe0dd82
1 changed files with 13 additions and 3 deletions
|
@ -2076,9 +2076,8 @@ def test_stress_bucket_acls_changes():
|
||||||
_test_bucket_acls_changes_persistent(bucket);
|
_test_bucket_acls_changes_persistent(bucket);
|
||||||
|
|
||||||
class FakeFile(object):
|
class FakeFile(object):
|
||||||
def __init__(self, size, char='A', interrupt=None):
|
def __init__(self, char='A', interrupt=None):
|
||||||
self.offset = 0
|
self.offset = 0
|
||||||
self.size = size
|
|
||||||
self.char = char
|
self.char = char
|
||||||
self.interrupt = interrupt
|
self.interrupt = interrupt
|
||||||
|
|
||||||
|
@ -2089,6 +2088,10 @@ class FakeFile(object):
|
||||||
return self.offset
|
return self.offset
|
||||||
|
|
||||||
class FakeWriteFile(FakeFile):
|
class FakeWriteFile(FakeFile):
|
||||||
|
def __init__(self, size, char='A', interrupt=None):
|
||||||
|
FakeFile.__init__(self, char, interrupt)
|
||||||
|
self.size = size
|
||||||
|
|
||||||
def read(self, size=-1):
|
def read(self, size=-1):
|
||||||
if size < 0:
|
if size < 0:
|
||||||
size = self.size - self.offset
|
size = self.size - self.offset
|
||||||
|
@ -2103,12 +2106,15 @@ class FakeWriteFile(FakeFile):
|
||||||
|
|
||||||
class FakeReadFile(FakeFile):
|
class FakeReadFile(FakeFile):
|
||||||
def __init__(self, size, char='A', interrupt=None):
|
def __init__(self, size, char='A', interrupt=None):
|
||||||
FakeFile.__init__(self, size, char, interrupt)
|
FakeFile.__init__(self, char, interrupt)
|
||||||
self.interrupted = False
|
self.interrupted = False
|
||||||
|
self.size = 0
|
||||||
|
self.expected_size = size
|
||||||
|
|
||||||
def write(self, chars):
|
def write(self, chars):
|
||||||
eq(chars, self.char*len(chars))
|
eq(chars, self.char*len(chars))
|
||||||
self.offset += len(chars)
|
self.offset += len(chars)
|
||||||
|
self.size += len(chars)
|
||||||
|
|
||||||
# Sneaky! do stuff on the second seek
|
# Sneaky! do stuff on the second seek
|
||||||
if not self.interrupted and self.interrupt != None \
|
if not self.interrupted and self.interrupt != None \
|
||||||
|
@ -2116,6 +2122,9 @@ class FakeReadFile(FakeFile):
|
||||||
self.interrupt()
|
self.interrupt()
|
||||||
self.interrupted = True
|
self.interrupted = True
|
||||||
|
|
||||||
|
def close(self):
|
||||||
|
eq(self.size, self.expected_size)
|
||||||
|
|
||||||
def _verify_atomic_key_data(key, size=-1, char=None):
|
def _verify_atomic_key_data(key, size=-1, char=None):
|
||||||
fp_verify = FakeFileVerifier(char)
|
fp_verify = FakeFileVerifier(char)
|
||||||
key.get_contents_to_file(fp_verify)
|
key.get_contents_to_file(fp_verify)
|
||||||
|
@ -2137,6 +2146,7 @@ def _test_atomic_read(file_size):
|
||||||
|
|
||||||
# read object while writing it to it
|
# read object while writing it to it
|
||||||
key.get_contents_to_file(fp_a2)
|
key.get_contents_to_file(fp_a2)
|
||||||
|
fp_a2.close()
|
||||||
|
|
||||||
_verify_atomic_key_data(key, file_size, 'B')
|
_verify_atomic_key_data(key, file_size, 'B')
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue