ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-20 05:28:04 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Clarify argument names.

Browse Source
This commit is contained in:
Itamar Turner-Trauring 2021-09-13 09:35:52 -04:00
parent 1fa0f72c8e
commit b01c5c7454
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/allmydata/test/test_istorageserver.py
View File

@ -78,11 +78,11 @@ class IStorageServerImmutableAPIsTestsMixin(object):
""" """
(already_got, allocated) = yield self.storage_server.allocate_buckets( (already_got, allocated) = yield self.storage_server.allocate_buckets(
new_storage_index(), new_storage_index(),
new_secret(), renew_secret=new_secret(),
new_secret(), cancel_secret=new_secret(),
set(range(5)), sharenums=set(range(5)),
1024, allocated_size=1024,
Referenceable(), canary=Referenceable(),
) )
self.assertEqual(already_got, set()) self.assertEqual(already_got, set())
self.assertEqual(set(allocated.keys()), set(range(5))) self.assertEqual(set(allocated.keys()), set(range(5)))
@ -97,21 +97,21 @@ class IStorageServerImmutableAPIsTestsMixin(object):
This fails due to https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3793 This fails due to https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3793
""" """
si, renew_secret, cancel_secret = ( storage_index, renew_secret, cancel_secret = (
new_storage_index(), new_storage_index(),
new_secret(), new_secret(),
new_secret(), new_secret(),
) )
(already_got, allocated) = yield self.storage_server.allocate_buckets( (already_got, allocated) = yield self.storage_server.allocate_buckets(
si, storage_index,
renew_secret, renew_secret,
cancel_secret, cancel_secret,
set(range(5)), sharenums=set(range(5)),
1024, allocated_size=1024,
Referenceable(), canary=Referenceable(),
) )
(already_got2, allocated2) = yield self.storage_server.allocate_buckets( (already_got2, allocated2) = yield self.storage_server.allocate_buckets(
si, storage_index,
renew_secret, renew_secret,
cancel_secret, cancel_secret,
set(range(5)), set(range(5)),
@ -130,26 +130,26 @@ class IStorageServerImmutableAPIsTestsMixin(object):
Fails due to https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3793 Fails due to https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3793
""" """
si, renew_secret, cancel_secret = ( storage_index, renew_secret, cancel_secret = (
new_storage_index(), new_storage_index(),
new_secret(), new_secret(),
new_secret(), new_secret(),
) )
yield self.storage_server.allocate_buckets( yield self.storage_server.allocate_buckets(
si, storage_index,
renew_secret, renew_secret,
cancel_secret, cancel_secret,
set(range(5)), sharenums=set(range(5)),
1024, allocated_size=1024,
Referenceable(), canary=Referenceable(),
) )
(already_got2, allocated2) = yield self.storage_server.allocate_buckets( (already_got2, allocated2) = yield self.storage_server.allocate_buckets(
si, storage_index,
renew_secret, renew_secret,
cancel_secret, cancel_secret,
set(range(7)), sharenums=set(range(7)),
1024, allocated_size=1024,
Referenceable(), canary=Referenceable(),
) )
self.assertEqual(already_got2, set()) # none were fully written self.assertEqual(already_got2, set()) # none were fully written
self.assertEqual(set(allocated2.keys()), set(range(7))) self.assertEqual(set(allocated2.keys()), set(range(7)))
@ -161,18 +161,18 @@ class IStorageServerImmutableAPIsTestsMixin(object):
``IStoragServer.allocate_buckets()``. Partially-written or empty ``IStoragServer.allocate_buckets()``. Partially-written or empty
shares don't. shares don't.
""" """
si, renew_secret, cancel_secret = ( storage_index, renew_secret, cancel_secret = (
new_storage_index(), new_storage_index(),
new_secret(), new_secret(),
new_secret(), new_secret(),
) )
(_, allocated) = yield self.storage_server.allocate_buckets( (_, allocated) = yield self.storage_server.allocate_buckets(
si, storage_index,
renew_secret, renew_secret,
cancel_secret, cancel_secret,
set(range(5)), sharenums=set(range(5)),
1024, allocated_size=1024,
Referenceable(), canary=Referenceable(),
) )
# Bucket 1 is fully written in one go. # Bucket 1 is fully written in one go.
@ -188,12 +188,12 @@ class IStorageServerImmutableAPIsTestsMixin(object):
yield allocated[0].callRemote("write", 0, b"1" * 512) yield allocated[0].callRemote("write", 0, b"1" * 512)
(already_got, _) = yield self.storage_server.allocate_buckets( (already_got, _) = yield self.storage_server.allocate_buckets(
si, storage_index,
renew_secret, renew_secret,
cancel_secret, cancel_secret,
set(range(5)), sharenums=set(range(5)),
1024, allocated_size=1024,
Referenceable(), canary=Referenceable(),
) )
self.assertEqual(already_got, {1, 2}) self.assertEqual(already_got, {1, 2})
@ -208,18 +208,18 @@ class IStorageServerImmutableAPIsTestsMixin(object):
2. When overlapping writes happen, the resulting read returns the 2. When overlapping writes happen, the resulting read returns the
earliest written value. earliest written value.
""" """
si, renew_secret, cancel_secret = ( storage_index, renew_secret, cancel_secret = (
new_storage_index(), new_storage_index(),
new_secret(), new_secret(),
new_secret(), new_secret(),
) )
(_, allocated) = yield self.storage_server.allocate_buckets( (_, allocated) = yield self.storage_server.allocate_buckets(
si, storage_index,
renew_secret, renew_secret,
cancel_secret, cancel_secret,
set(range(5)), sharenums=set(range(5)),
1024, allocated_size=1024,
Referenceable(), canary=Referenceable(),
) )
# Bucket 1 is fully written in order # Bucket 1 is fully written in order
@ -238,7 +238,7 @@ class IStorageServerImmutableAPIsTestsMixin(object):
yield allocated[3].callRemote("write", 24, b"6" * 1000) yield allocated[3].callRemote("write", 24, b"6" * 1000)
yield allocated[3].callRemote("close") yield allocated[3].callRemote("close")
buckets = yield self.storage_server.get_buckets(si) buckets = yield self.storage_server.get_buckets(storage_index)
self.assertEqual(set(buckets.keys()), {1, 2, 3}) self.assertEqual(set(buckets.keys()), {1, 2, 3})
self.assertEqual( self.assertEqual(