projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4533: Merge branch 'master' into 4533-remote-reset
[arvados.git]
/
services
/
nodemanager
/
tests
/
testutil.py
diff --git
a/services/nodemanager/tests/testutil.py
b/services/nodemanager/tests/testutil.py
index 0c63db32b9ca6b3ca2aef249cbd2db6088d66d2d..56f22c8e08fc66f69c90422e30bb116b372dfbf6 100644
(file)
--- a/
services/nodemanager/tests/testutil.py
+++ b/
services/nodemanager/tests/testutil.py
@@
-15,7
+15,7
@@
def arvados_node_mock(node_num=99, job_uuid=None, age=0, **kwargs):
if job_uuid is True:
job_uuid = 'zzzzz-jjjjj-jobjobjobjobjob'
slurm_state = 'idle' if (job_uuid is None) else 'alloc'
if job_uuid is True:
job_uuid = 'zzzzz-jjjjj-jobjobjobjobjob'
slurm_state = 'idle' if (job_uuid is None) else 'alloc'
- node = {'uuid': 'zzzzz-yyyyy-
12345abcde67890'
,
+ node = {'uuid': 'zzzzz-yyyyy-
{:015x}'.format(node_num)
,
'created_at': '2014-01-01T01:02:03Z',
'modified_at': time.strftime('%Y-%m-%dT%H:%M:%SZ',
time.gmtime(time.time() - age)),
'created_at': '2014-01-01T01:02:03Z',
'modified_at': time.strftime('%Y-%m-%dT%H:%M:%SZ',
time.gmtime(time.time() - age)),
@@
-41,6
+41,12
@@
def cloud_node_mock(node_num=99):
def ip_address_mock(last_octet):
return '10.20.30.{}'.format(last_octet)
def ip_address_mock(last_octet):
return '10.20.30.{}'.format(last_octet)
+class MockShutdownTimer(object):
+ def _set_state(self, is_open, next_opening):
+ self.window_open = lambda: is_open
+ self.next_opening = lambda: next_opening
+
+
class MockSize(object):
def __init__(self, factor):
self.id = 'z{}.test'.format(factor)
class MockSize(object):
def __init__(self, factor):
self.id = 'z{}.test'.format(factor)