Merge "We should await ws.send_str()" into feature/zuulv3
diff --git a/.zuul.yaml b/.zuul.yaml
index 1962611..2eadd4f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -77,7 +77,5 @@
- zuul-stream-functional
post:
jobs:
- - publish-openstack-python-docs-infra:
- vars:
- afs_publisher_target: 'infra/zuul'
+ - publish-openstack-python-docs-infra
- publish-openstack-python-branch-tarball
diff --git a/tests/unit/test_v3.py b/tests/unit/test_v3.py
index c24a9de..1c633ba 100755
--- a/tests/unit/test_v3.py
+++ b/tests/unit/test_v3.py
@@ -399,6 +399,7 @@
self.fake_gerrit.addEvent(
self.fake_gerrit.getFakeBranchCreatedEvent(
'org/project', 'stable'))
+ self.waitUntilSettled()
A = self.fake_gerrit.addFakeChange('org/project', 'stable', 'A',
files=file_dict)
A.addApproval('Code-Review', 2)
diff --git a/zuul/configloader.py b/zuul/configloader.py
index f3ab72c..afdf329 100644
--- a/zuul/configloader.py
+++ b/zuul/configloader.py
@@ -1391,7 +1391,7 @@
if not job.updated:
raise Exception("Cat job %s failed" % (job,))
TenantParser.log.debug("Cat job %s got files %s" %
- (job, job.files))
+ (job, job.files.keys()))
loaded = False
files = sorted(job.files.keys())
for conf_root in ['zuul.yaml', 'zuul.d', '.zuul.yaml', '.zuul.d']: