Skip to content

Commit 95dd47f

Browse files
committed
cast MockObjectStore to BaseObjectStore
1 parent 3292167 commit 95dd47f

1 file changed

Lines changed: 22 additions & 22 deletions

File tree

test/unit/data/test_quota.py

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import uuid
22
from decimal import Decimal
3+
from typing import cast
34

45
from galaxy import model
56
from galaxy.model.unittest_utils.utils import random_email
67
from galaxy.objectstore import (
8+
BaseObjectStore,
79
build_object_store_from_config,
810
QuotaSourceInfo,
911
QuotaSourceMap,
@@ -72,6 +74,7 @@ def test_calculate_usage_per_source(self):
7274

7375
class TestCalculateUsage(BaseModelTestCase):
7476
def setUp(self):
77+
self.object_store = cast(BaseObjectStore, MockObjectStore())
7578
u = model.User(email=f"calc_usage{uuid.uuid1()}@example.com", password="password")
7679
self.persist(u)
7780
h = model.History(name="History for Calculated Usage", user=u)
@@ -94,11 +97,10 @@ def test_calculate_usage(self):
9497

9598
d1 = self._add_dataset(10)
9699

97-
object_store = MockObjectStore()
98-
assert u.calculate_disk_usage_default_source(object_store) == 10
100+
assert u.calculate_disk_usage_default_source(self.object_store) == 10
99101
assert u.disk_usage is None
100-
u.calculate_and_set_disk_usage(object_store)
101-
assert u.calculate_disk_usage_default_source(object_store) == 10
102+
u.calculate_and_set_disk_usage(self.object_store)
103+
assert u.calculate_disk_usage_default_source(self.object_store) == 10
102104
# method no longer updates user object
103105
# assert u.disk_usage == 10
104106

@@ -112,7 +114,7 @@ def test_calculate_usage(self):
112114
d3 = model.HistoryDatasetAssociation(extension="txt", history=h, dataset=d1.dataset)
113115
self.persist(d3)
114116

115-
assert u.calculate_disk_usage_default_source(object_store) == 10
117+
assert u.calculate_disk_usage_default_source(self.object_store) == 10
116118

117119
def test_calculate_usage_with_user_provided_storage(self):
118120
u = self.u
@@ -121,11 +123,10 @@ def test_calculate_usage_with_user_provided_storage(self):
121123
# This dataset should not be counted towards the user's disk usage
122124
self._add_dataset(30, object_store_id="user_objects://user/provided/storage")
123125

124-
object_store = MockObjectStore()
125-
assert u.calculate_disk_usage_default_source(object_store) == 10
126+
assert u.calculate_disk_usage_default_source(self.object_store) == 10
126127
assert u.disk_usage is None
127-
u.calculate_and_set_disk_usage(object_store)
128-
assert u.calculate_disk_usage_default_source(object_store) == 10
128+
u.calculate_and_set_disk_usage(self.object_store)
129+
assert u.calculate_disk_usage_default_source(self.object_store) == 10
129130

130131
self._refresh_user_and_assert_disk_usage_is(10)
131132

@@ -134,11 +135,10 @@ def test_calculate_usage_readjusts_incorrect_quota(self):
134135

135136
self._add_dataset(10)
136137

137-
object_store = MockObjectStore()
138-
assert u.calculate_disk_usage_default_source(object_store) == 10
138+
assert u.calculate_disk_usage_default_source(self.object_store) == 10
139139
assert u.disk_usage is None
140-
u.calculate_and_set_disk_usage(object_store)
141-
assert u.calculate_disk_usage_default_source(object_store) == 10
140+
u.calculate_and_set_disk_usage(self.object_store)
141+
assert u.calculate_disk_usage_default_source(self.object_store) == 10
142142

143143
self._refresh_user_and_assert_disk_usage_is(10)
144144

@@ -148,7 +148,7 @@ def test_calculate_usage_readjusts_incorrect_quota(self):
148148
self._refresh_user_and_assert_disk_usage_is(-10)
149149

150150
# recalculate and verify it is fixed
151-
u.calculate_and_set_disk_usage(object_store)
151+
u.calculate_and_set_disk_usage(self.object_store)
152152
self._refresh_user_and_assert_disk_usage_is(10)
153153

154154
# break it again
@@ -157,7 +157,7 @@ def test_calculate_usage_readjusts_incorrect_quota(self):
157157
self._refresh_user_and_assert_disk_usage_is(1000)
158158

159159
# recalculate and verify it is fixed
160-
u.calculate_and_set_disk_usage(object_store)
160+
u.calculate_and_set_disk_usage(self.object_store)
161161
self._refresh_user_and_assert_disk_usage_is(10)
162162

163163
def test_calculate_objectstore_usage(self):
@@ -185,7 +185,7 @@ def test_calculate_usage_disabled_quota(self):
185185
not_tracked.default_quota_enabled = False
186186
quota_source_map.backends["not_tracked"] = not_tracked
187187

188-
object_store = MockObjectStore(quota_source_map)
188+
object_store = cast(BaseObjectStore, MockObjectStore(quota_source_map))
189189

190190
assert u.calculate_disk_usage_default_source(object_store) == 15
191191

@@ -200,7 +200,7 @@ def test_calculate_usage_alt_quota(self):
200200
alt_source.default_quota_source = "alt_source"
201201
quota_source_map.backends["alt_source_store"] = alt_source
202202

203-
object_store = MockObjectStore(quota_source_map)
203+
object_store = cast(BaseObjectStore, MockObjectStore(quota_source_map))
204204

205205
u.calculate_and_set_disk_usage(object_store)
206206
self.model.context.refresh(u)
@@ -235,7 +235,7 @@ def test_calculate_usage_removes_unused_quota_labels(self):
235235
alt_source.default_quota_source = "alt_source"
236236
quota_source_map.backends["alt_source_store"] = alt_source
237237

238-
object_store = MockObjectStore(quota_source_map)
238+
object_store = cast(BaseObjectStore, MockObjectStore(quota_source_map))
239239

240240
u.calculate_and_set_disk_usage(object_store)
241241
self.model.context.refresh(u)
@@ -284,7 +284,7 @@ def test_dictify_usage_unused_quota_labels(self):
284284
unused_source.default_quota_source = "unused_source"
285285
quota_source_map.backends["unused_source_store"] = unused_source
286286

287-
object_store = MockObjectStore(quota_source_map)
287+
object_store = cast(BaseObjectStore, MockObjectStore(quota_source_map))
288288
u.calculate_and_set_disk_usage(object_store)
289289
self.model.context.refresh(u)
290290
usages = u.dictify_usage(object_store)
@@ -300,7 +300,7 @@ def test_calculate_usage_default_storage_disabled(self):
300300
alt_source = QuotaSourceMap("alt_source", True)
301301
quota_source_map.backends["alt_source_store"] = alt_source
302302

303-
object_store = MockObjectStore(quota_source_map)
303+
object_store = cast(BaseObjectStore, MockObjectStore(quota_source_map))
304304

305305
u.calculate_and_set_disk_usage(object_store)
306306
self.model.context.refresh(u)
@@ -325,7 +325,7 @@ def test_update_usage_from_labeled_to_unlabeled(self):
325325
alt_source = QuotaSourceMap("alt_source", True)
326326
quota_source_map.backends["alt_source_store"] = alt_source
327327

328-
object_store = MockObjectStore(quota_source_map)
328+
object_store = cast(BaseObjectStore, MockObjectStore(quota_source_map))
329329
u.calculate_and_set_disk_usage(object_store)
330330
self._refresh_user_and_assert_disk_usage_is(10)
331331
quota_agent.relabel_quota_for_dataset(alt_d.dataset, "alt_source", None)
@@ -345,7 +345,7 @@ def test_update_usage_from_unlabeled_to_labeled(self):
345345
alt_source = QuotaSourceMap("alt_source", True)
346346
quota_source_map.backends["alt_source_store"] = alt_source
347347

348-
object_store = MockObjectStore(quota_source_map)
348+
object_store = cast(BaseObjectStore, MockObjectStore(quota_source_map))
349349
u.calculate_and_set_disk_usage(object_store)
350350
self._refresh_user_and_assert_disk_usage_is(15, "alt_source")
351351
quota_agent.relabel_quota_for_dataset(d.dataset, None, "alt_source")

0 commit comments

Comments
 (0)