From 883c30e947890e3901c24536db4851930432c585 Mon Sep 17 00:00:00 2001
From: Clint Byrum <clint@fewbar.com>
Date: Tue, 13 Dec 2016 11:54:33 -0800
Subject: [PATCH] Re-enable test_no_job_project

Minimal changes are needed, just translation of the old layout to new
and tenant API differences.

Change-Id: I3563fd1998dcc16426d665d50e26644b45198be0
Story: 2000773
Task: 3429
---
 .../config/single-tenant/git/common-config/zuul.yaml  | 11 +++++++++++
 .../single-tenant/git/org_no-jobs-project/README      |  1 +
 tests/test_scheduler.py                               |  4 ++--
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 tests/fixtures/config/single-tenant/git/org_no-jobs-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 110fc4ad6c..8975fc46a3 100644
--- a/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml
+++ b/tests/fixtures/config/single-tenant/git/common-config/zuul.yaml
@@ -103,6 +103,11 @@
     name: nonvoting-project-test2
     voting: false
 
+- job:
+    name: project-testfile
+    files:
+      - '.*-requires'
+
 - project:
     name: org/project
     check:
@@ -180,3 +185,9 @@
             jobs:
               - nonvoting-project-test1
               - nonvoting-project-test2
+
+- project:
+    name: org/no-jobs-project
+    check:
+      jobs:
+        - project-testfile
diff --git a/tests/fixtures/config/single-tenant/git/org_no-jobs-project/README b/tests/fixtures/config/single-tenant/git/org_no-jobs-project/README
new file mode 100644
index 0000000000..44f3bacb96
--- /dev/null
+++ b/tests/fixtures/config/single-tenant/git/org_no-jobs-project/README
@@ -0,0 +1 @@
+staypuft
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index 8ae2213582..b9131a05e6 100755
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -1963,7 +1963,6 @@ class TestScheduler(ZuulTestCase):
         self.assertEqual(A.data['status'], 'MERGED')
         self.assertEqual(A.reported, 2)
 
-    @skip("Disabled for early v3 development")
     def test_no_job_project(self):
         "Test that reports with no jobs don't get sent"
         A = self.fake_gerrit.addFakeChange('org/no-jobs-project',
@@ -1975,7 +1974,8 @@ class TestScheduler(ZuulTestCase):
         self.assertEqual(A.reported, False)
 
         # Check queue is empty afterwards
-        check_pipeline = self.sched.layout.pipelines['check']
+        tenant = self.sched.abide.tenants.get('tenant-one')
+        check_pipeline = tenant.layout.pipelines['check']
         items = check_pipeline.getAllItems()
         self.assertEqual(len(items), 0)