From 13c6b4a6d8008714dbf3abd166fe0fb266edafc1 Mon Sep 17 00:00:00 2001
From: Clint Byrum <clint@fewbar.com>
Date: Tue, 13 Dec 2016 11:43:09 -0800
Subject: [PATCH] Re-enable test_nonvoting_job

The layout simply needed to be translated to the new format. The test
itself still functions withoutmodification.

Change-Id: Ibdeef6e3a303faa6e67be8a2f7ed71b8529ecaf3
Story: 2000773
Task: 3428
---
 .../single-tenant/git/common-config/zuul.yaml | 26 +++++++++++++++++++
 .../git/org_nonvoting-project/README          |  1 +
 tests/test_scheduler.py                       |  1 -
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 tests/fixtures/config/single-tenant/git/org_nonvoting-project/README

diff --git a/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml b/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml
index 7f32876b2c..110fc4ad6c 100644
--- a/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml
+++ b/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml
@@ -92,6 +92,17 @@
 - job:
     name: experimental-project-test
 
+- job:
+    name: nonvoting-project-merge
+    hold-following-changes: true
+
+- job:
+    name: nonvoting-project-test1
+
+- job:
+    name: nonvoting-project-test2
+    voting: false
+
 - project:
     name: org/project
     check:
@@ -154,3 +165,18 @@
     gate:
       jobs:
         - noop
+
+- project:
+    name: org/nonvoting-project
+    check:
+      jobs:
+        - nonvoting-project-merge:
+            jobs:
+              - nonvoting-project-test1
+              - nonvoting-project-test2
+    gate:
+      jobs:
+        - nonvoting-project-merge:
+            jobs:
+              - nonvoting-project-test1
+              - nonvoting-project-test2
diff --git a/tests/fixtures/config/single-tenant/git/org_nonvoting-project/README b/tests/fixtures/config/single-tenant/git/org_nonvoting-project/README
new file mode 100644
index 0000000000..2cc3865755
--- /dev/null
+++ b/tests/fixtures/config/single-tenant/git/org_nonvoting-project/README
@@ -0,0 +1 @@
+dont tread on me
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index b7cf912191..8ae2213582 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -1332,7 +1332,6 @@ class TestScheduler(ZuulTestCase):
         self.assertEqual(B.reported, 2)
         self.assertEqual(C.reported, 2)
 
-    @skip("Disabled for early v3 development")
     def test_nonvoting_job(self):
         "Test that non-voting jobs don't vote."