projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 4227-date-display
[arvados.git]
/
services
/
nodemanager
/
tests
/
test_jobqueue.py
diff --git
a/services/nodemanager/tests/test_jobqueue.py
b/services/nodemanager/tests/test_jobqueue.py
index 3814ba4610a3db416c01d5e3ddb2c5d31de435b2..0a4d136d402cbfa7e022a25ad98bc300a5c640ce 100644
(file)
--- a/
services/nodemanager/tests/test_jobqueue.py
+++ b/
services/nodemanager/tests/test_jobqueue.py
@@
-14,7
+14,9
@@
class ServerCalculatorTestCase(unittest.TestCase):
def calculate(self, servcalc, *constraints):
return servcalc.servers_for_queue(
def calculate(self, servcalc, *constraints):
return servcalc.servers_for_queue(
- [{'runtime_constraints': cdict} for cdict in constraints])
+ [{'uuid': 'zzzzz-jjjjj-{:015x}'.format(index),
+ 'runtime_constraints': cdict}
+ for index, cdict in enumerate(constraints)])
def test_empty_queue_needs_no_servers(self):
servcalc = self.make_calculator([1])
def test_empty_queue_needs_no_servers(self):
servcalc = self.make_calculator([1])
@@
-63,8
+65,8
@@
class JobQueueMonitorActorTestCase(testutil.RemotePollLoopActorTestMixin,
def test_subscribers_get_server_lists(self):
self.build_monitor([{'items': [1, 2]}], self.MockCalculator())
def test_subscribers_get_server_lists(self):
self.build_monitor([{'items': [1, 2]}], self.MockCalculator())
- self.monitor.subscribe(self.subscriber)
- self.
wait_for_call(self.subscribe
r)
+ self.monitor.subscribe(self.subscriber)
.get(self.TIMEOUT)
+ self.
stop_proxy(self.monito
r)
self.subscriber.assert_called_with([testutil.MockSize(1),
testutil.MockSize(2)])
self.subscriber.assert_called_with([testutil.MockSize(1),
testutil.MockSize(2)])