From e38916a48ae38c7c08493c4a66e4ed046a6b7fde Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 12 Nov 2021 11:35:58 -0500
Subject: [PATCH] Factor this helper out so it can be re-used
---
.../tests/test_storage_protocol.py | 28 +++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/_zkapauthorizer/tests/test_storage_protocol.py b/src/_zkapauthorizer/tests/test_storage_protocol.py
index 32e7e40..c027dfd 100644
--- a/src/_zkapauthorizer/tests/test_storage_protocol.py
+++ b/src/_zkapauthorizer/tests/test_storage_protocol.py
@@ -449,20 +449,6 @@ class ShareTests(TestCase):
),
)
- def get_lease_grant_times(storage_server, storage_index):
- """
- Get the grant times for all of the leases for all of the shares at the
- given storage index.
- """
- shares = storage_server._get_bucket_shares(storage_index)
- for sharenum, sharepath in shares:
- sharefile = get_share_file(sharepath)
- leases = sharefile.get_leases()
- grant_times = list(
- lease.get_grant_renew_time_time() for lease in leases
- )
- yield sharenum, grant_times
-
expected_leases = {}
# Chop off the non-integer part of the expected values because share
# files only keep integer precision.
@@ -1161,3 +1147,17 @@ def write_vector_to_read_vector(write_vector):
write vector.
"""
return (write_vector[0], len(write_vector[1]))
+
+def get_lease_grant_times(storage_server, storage_index):
+ """
+ Get the grant times for all of the leases for all of the shares at the
+ given storage index.
+ """
+ shares = storage_server._get_bucket_shares(storage_index)
+ for sharenum, sharepath in shares:
+ sharefile = get_share_file(sharepath)
+ leases = sharefile.get_leases()
+ grant_times = list(
+ lease.get_grant_renew_time_time() for lease in leases
+ )
+ yield sharenum, grant_times
--
GitLab