Merge "Ensure correct lexical sorting of node requests"

This commit is contained in:
Zuul 2019-03-15 05:47:33 +00:00 committed by Gerrit Code Review
commit 9f139d0481
3 changed files with 4 additions and 3 deletions

View File

@ -2,6 +2,7 @@
name: check
manager: independent
post-review: true
precedence: high
trigger:
gerrit:
- event: patchset-created

View File

@ -5265,7 +5265,7 @@ class TestJobPausePriority(AnsibleZuulTestCase):
reqs = self.fake_nodepool.getNodeRequests()
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.fake_nodepool.unpause()
@ -5280,7 +5280,7 @@ class TestJobPausePriority(AnsibleZuulTestCase):
break
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.fake_nodepool.unpause()

View File

@ -166,7 +166,7 @@ class ZooKeeper(object):
node_request.created_time = time.time()
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),
makepath=True,
sequence=True, ephemeral=True)