projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
10805: Fix crash during shutdown when running with llfuse 1.x.
[arvados.git]
/
services
/
nodemanager
/
tests
/
testutil.py
diff --git
a/services/nodemanager/tests/testutil.py
b/services/nodemanager/tests/testutil.py
index 15337c4120173b6a7f2ca6b21f0924bd571f2326..0a483709adf5b69a8fd13647f9e9bd866fa836cf 100644
(file)
--- a/
services/nodemanager/tests/testutil.py
+++ b/
services/nodemanager/tests/testutil.py
@@
-1,4
+1,7
@@
#!/usr/bin/env python
#!/usr/bin/env python
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
from __future__ import absolute_import, print_function
from __future__ import absolute_import, print_function
@@
-79,7
+82,8
@@
class MockSize(object):
self.id = 'z{}.test'.format(factor)
self.name = self.id
self.ram = 128 * factor
self.id = 'z{}.test'.format(factor)
self.name = self.id
self.ram = 128 * factor
- self.disk = 100 * factor
+ self.disk = factor # GB
+ self.scratch = 1000 * factor # MB
self.bandwidth = 16 * factor
self.price = float(factor)
self.extra = {}
self.bandwidth = 16 * factor
self.price = float(factor)
self.extra = {}
@@
-209,7
+213,9
@@
class RemotePollLoopActorTestMixin(ActorTestMixin):
self.monitor = self.TEST_CLASS.start(
self.client, self.timer, *args, **kwargs).proxy()
self.monitor = self.TEST_CLASS.start(
self.client, self.timer, *args, **kwargs).proxy()
-def cloud_node_mock(node_num=99, size=MockSize(1), **extra):
+def cloud_node_mock(node_num=99, size=None, **extra):
+ if size is None:
+ size = MockSize(node_num)
node = mock.NonCallableMagicMock(
['id', 'name', 'state', 'public_ips', 'private_ips', 'driver', 'size',
'image', 'extra'],
node = mock.NonCallableMagicMock(
['id', 'name', 'state', 'public_ips', 'private_ips', 'driver', 'size',
'image', 'extra'],