commit 8688306f59306e91e07a209132d91a51b1f73e3b
author Tristan Cacqueray <tdecacqu@redhat.com> Tue Jul 11 06:00:07 2017 +0000
committer Tristan Cacqueray <tdecacqu@redhat.com> Fri Jul 14 06:15:51 2017 +0000
tree 769a7179fae9933d04f430ece1f771090be2da30
parent 9a4d73f34f5dba715252b08d3b0cb1cf41fd1f42

Fix zuul.(yaml|d) loading order and add tests

This change fixes the configloader to load file in a more logical order:
zuul.yaml, zuul.d, .zuul.yaml then .zuul.d.

This change also adds negative test for config path conflicts.

Change-Id: Ifbbfb4389b7aa0a641b95b5947abc8a56e362ee3

tests/fixtures/config/conflict-config/main.yaml

diff --git a/tests/fixtures/config/conflict-config/main.yaml b/tests/fixtures/config/conflict-config/main.yaml
new file mode 100644
index 0000000..208e274
--- /dev/null
+++ b/tests/fixtures/config/conflict-config/main.yaml
@@ -0,0 +1,8 @@
+- tenant:
+    name: tenant-one
+    source:
+      gerrit:
+        config-projects:
+          - common-config
+        untrusted-projects:
+          - org/project