ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-25 15:41:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reduce duplication.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2022-02-09 12:37:49 -05:00
parent 95d7548629
commit 8c739343f3
1 changed files with 39 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
src/allmydata/test/test_storage_http.py
View File

@ -373,6 +373,28 @@ class ImmutableHTTPAPITests(SyncTestCase):
self.skipTest("Not going to bother supporting Python 2") self.skipTest("Not going to bother supporting Python 2")
super(ImmutableHTTPAPITests, self).setUp() super(ImmutableHTTPAPITests, self).setUp()
self.http = self.useFixture(HttpTestFixture()) self.http = self.useFixture(HttpTestFixture())
self.im_client = StorageClientImmutables(self.http.client)
def create_upload(self, share_numbers, length):
"""
Create a write bucket on server, return:
(upload_secret, lease_secret, storage_index, result)
"""
upload_secret = urandom(32)
lease_secret = urandom(32)
storage_index = urandom(16)
created = result_of(
self.im_client.create(
storage_index,
share_numbers,
length,
upload_secret,
lease_secret,
lease_secret,
)
)
return (upload_secret, lease_secret, storage_index, created)
def test_upload_can_be_downloaded(self): def test_upload_can_be_downloaded(self):
""" """
@ -386,17 +408,8 @@ class ImmutableHTTPAPITests(SyncTestCase):
length = 100 length = 100
expected_data = b"".join(bytes([i]) for i in range(100)) expected_data = b"".join(bytes([i]) for i in range(100))
im_client = StorageClientImmutables(self.http.client)
# Create a upload: # Create a upload:
upload_secret = urandom(32) (upload_secret, _, storage_index, created) = self.create_upload({1}, 100)
lease_secret = urandom(32)
storage_index = b"".join(bytes([i]) for i in range(16))
created = result_of(
im_client.create(
storage_index, {1}, 100, upload_secret, lease_secret, lease_secret
)
)
self.assertEqual( self.assertEqual(
created, ImmutableCreateResult(already_have=set(), allocated={1}) created, ImmutableCreateResult(already_have=set(), allocated={1})
) )
@ -407,7 +420,7 @@ class ImmutableHTTPAPITests(SyncTestCase):
# Three writes: 10-19, 30-39, 50-59. This allows for a bunch of holes. # Three writes: 10-19, 30-39, 50-59. This allows for a bunch of holes.
def write(offset, length): def write(offset, length):
remaining.empty(offset, offset + length) remaining.empty(offset, offset + length)
return im_client.write_share_chunk( return self.im_client.write_share_chunk(
storage_index, storage_index,
1, 1,
upload_secret, upload_secret,
@ -451,7 +464,7 @@ class ImmutableHTTPAPITests(SyncTestCase):
# We can now read: # We can now read:
for offset, length in [(0, 100), (10, 19), (99, 1), (49, 200)]: for offset, length in [(0, 100), (10, 19), (99, 1), (49, 200)]:
downloaded = result_of( downloaded = result_of(
im_client.read_share_chunk(storage_index, 1, offset, length) self.im_client.read_share_chunk(storage_index, 1, offset, length)
) )
self.assertEqual(downloaded, expected_data[offset : offset + length]) self.assertEqual(downloaded, expected_data[offset : offset + length])
@ -460,20 +473,13 @@ class ImmutableHTTPAPITests(SyncTestCase):
If allocate buckets endpoint is called second time with wrong upload If allocate buckets endpoint is called second time with wrong upload
key on the same shares, the result is an error. key on the same shares, the result is an error.
""" """
im_client = StorageClientImmutables(self.http.client)
# Create a upload: # Create a upload:
upload_secret = urandom(32) (upload_secret, lease_secret, storage_index, _) = self.create_upload(
lease_secret = urandom(32) {1, 2, 3}, 100
storage_index = b"".join(bytes([i]) for i in range(16))
result_of(
im_client.create(
storage_index, {1, 2, 3}, 100, upload_secret, lease_secret, lease_secret
)
) )
with self.assertRaises(ClientException) as e: with self.assertRaises(ClientException) as e:
result_of( result_of(
im_client.create( self.im_client.create(
storage_index, {2, 3}, 100, b"x" * 32, lease_secret, lease_secret storage_index, {2, 3}, 100, b"x" * 32, lease_secret, lease_secret
) )
) )
@ -484,21 +490,14 @@ class ImmutableHTTPAPITests(SyncTestCase):
If allocate buckets endpoint is called second time with different If allocate buckets endpoint is called second time with different
upload key on different shares, that creates the buckets. upload key on different shares, that creates the buckets.
""" """
im_client = StorageClientImmutables(self.http.client)
# Create a upload: # Create a upload:
upload_secret = urandom(32) (upload_secret, lease_secret, storage_index, created) = self.create_upload(
lease_secret = urandom(32) {1, 2, 3}, 100
storage_index = b"".join(bytes([i]) for i in range(16))
result_of(
im_client.create(
storage_index, {1, 2, 3}, 100, upload_secret, lease_secret, lease_secret
)
) )
# Add same shares: # Add same shares:
created2 = result_of( created2 = result_of(
im_client.create( self.im_client.create(
storage_index, {4, 6}, 100, b"x" * 2, lease_secret, lease_secret storage_index, {4, 6}, 100, b"x" * 2, lease_secret, lease_secret
) )
) )
@ -508,23 +507,15 @@ class ImmutableHTTPAPITests(SyncTestCase):
""" """
Once a share is finished uploading, it's possible to list it. Once a share is finished uploading, it's possible to list it.
""" """
im_client = StorageClientImmutables(self.http.client) (upload_secret, _, storage_index, created) = self.create_upload({1, 2, 3}, 10)
upload_secret = urandom(32)
lease_secret = urandom(32)
storage_index = b"".join(bytes([i]) for i in range(16))
result_of(
im_client.create(
storage_index, {1, 2, 3}, 10, upload_secret, lease_secret, lease_secret
)
)
# Initially there are no shares: # Initially there are no shares:
self.assertEqual(result_of(im_client.list_shares(storage_index)), set()) self.assertEqual(result_of(self.im_client.list_shares(storage_index)), set())
# Upload shares 1 and 3: # Upload shares 1 and 3:
for share_number in [1, 3]: for share_number in [1, 3]:
progress = result_of( progress = result_of(
im_client.write_share_chunk( self.im_client.write_share_chunk(
storage_index, storage_index,
share_number, share_number,
upload_secret, upload_secret,
@ -535,22 +526,14 @@ class ImmutableHTTPAPITests(SyncTestCase):
self.assertTrue(progress.finished) self.assertTrue(progress.finished)
# Now shares 1 and 3 exist: # Now shares 1 and 3 exist:
self.assertEqual(result_of(im_client.list_shares(storage_index)), {1, 3}) self.assertEqual(result_of(self.im_client.list_shares(storage_index)), {1, 3})
def test_upload_bad_content_range(self): def test_upload_bad_content_range(self):
""" """
Malformed or invalid Content-Range headers to the immutable upload Malformed or invalid Content-Range headers to the immutable upload
endpoint result in a 416 error. endpoint result in a 416 error.
""" """
im_client = StorageClientImmutables(self.http.client) (upload_secret, _, storage_index, created) = self.create_upload({1}, 10)
upload_secret = urandom(32)
lease_secret = urandom(32)
storage_index = b"0" * 16
result_of(
im_client.create(
storage_index, {1}, 10, upload_secret, lease_secret, lease_secret
)
)
def check_invalid(bad_content_range_value): def check_invalid(bad_content_range_value):
client = StorageClientImmutables( client = StorageClientImmutables(
@ -579,29 +562,20 @@ class ImmutableHTTPAPITests(SyncTestCase):
""" """
Listing unknown storage index's shares results in empty list of shares. Listing unknown storage index's shares results in empty list of shares.
""" """
im_client = StorageClientImmutables(self.http.client)
storage_index = b"".join(bytes([i]) for i in range(16)) storage_index = b"".join(bytes([i]) for i in range(16))
self.assertEqual(result_of(im_client.list_shares(storage_index)), set()) self.assertEqual(result_of(self.im_client.list_shares(storage_index)), set())
def test_upload_non_existent_storage_index(self): def test_upload_non_existent_storage_index(self):
""" """
Uploading to a non-existent storage index or share number results in Uploading to a non-existent storage index or share number results in
404. 404.
""" """
im_client = StorageClientImmutables(self.http.client) (upload_secret, _, storage_index, _) = self.create_upload({1}, 10)
upload_secret = urandom(32)
lease_secret = urandom(32)
storage_index = b"".join(bytes([i]) for i in range(16))
result_of(
im_client.create(
storage_index, {1}, 10, upload_secret, lease_secret, lease_secret
)
)
def unknown_check(storage_index, share_number): def unknown_check(storage_index, share_number):
with self.assertRaises(ClientException) as e: with self.assertRaises(ClientException) as e:
result_of( result_of(
im_client.write_share_chunk( self.im_client.write_share_chunk(
storage_index, storage_index,
share_number, share_number,
upload_secret, upload_secret,