Merge "Ensure correct lexical sorting of node requests"
This commit is contained in:
commit
9f139d0481
@ -2,6 +2,7 @@
|
|||||||
name: check
|
name: check
|
||||||
manager: independent
|
manager: independent
|
||||||
post-review: true
|
post-review: true
|
||||||
|
precedence: high
|
||||||
trigger:
|
trigger:
|
||||||
gerrit:
|
gerrit:
|
||||||
- event: patchset-created
|
- event: patchset-created
|
||||||
|
@ -5265,7 +5265,7 @@ class TestJobPausePriority(AnsibleZuulTestCase):
|
|||||||
|
|
||||||
reqs = self.fake_nodepool.getNodeRequests()
|
reqs = self.fake_nodepool.getNodeRequests()
|
||||||
self.assertEqual(len(reqs), 1)
|
self.assertEqual(len(reqs), 1)
|
||||||
self.assertEqual(reqs[0]['_oid'], '200-0000000000')
|
self.assertEqual(reqs[0]['_oid'], '100-0000000000')
|
||||||
self.assertEqual(reqs[0]['provider'], None)
|
self.assertEqual(reqs[0]['provider'], None)
|
||||||
|
|
||||||
self.fake_nodepool.unpause()
|
self.fake_nodepool.unpause()
|
||||||
@ -5280,7 +5280,7 @@ class TestJobPausePriority(AnsibleZuulTestCase):
|
|||||||
break
|
break
|
||||||
|
|
||||||
self.assertEqual(len(reqs), 1)
|
self.assertEqual(len(reqs), 1)
|
||||||
self.assertEqual(reqs[0]['_oid'], '199-0000000001')
|
self.assertEqual(reqs[0]['_oid'], '099-0000000001')
|
||||||
self.assertEqual(reqs[0]['provider'], 'test-provider')
|
self.assertEqual(reqs[0]['provider'], 'test-provider')
|
||||||
|
|
||||||
self.fake_nodepool.unpause()
|
self.fake_nodepool.unpause()
|
||||||
|
@ -166,7 +166,7 @@ class ZooKeeper(object):
|
|||||||
node_request.created_time = time.time()
|
node_request.created_time = time.time()
|
||||||
data = node_request.toDict()
|
data = node_request.toDict()
|
||||||
|
|
||||||
path = '%s/%s-' % (self.REQUEST_ROOT, node_request.priority)
|
path = '{}/{:0>3}-'.format(self.REQUEST_ROOT, node_request.priority)
|
||||||
path = self.client.create(path, self._dictToStr(data),
|
path = self.client.create(path, self._dictToStr(data),
|
||||||
makepath=True,
|
makepath=True,
|
||||||
sequence=True, ephemeral=True)
|
sequence=True, ephemeral=True)
|
||||||
|
Loading…
Reference in New Issue
Block a user