commit 3aa6d47370db111c6335aab95f9ba9ee50c025fb
author Cullen Taylor <cullentaylor@outlook.com> Wed Mar 01 15:22:09 2017 -0600
committer Cullen Taylor <cullentaylor@outlook.com> Mon Mar 06 10:44:11 2017 -0600
tree acbefc729acf4fc3744e64ce4d5d6f645d1bb0c8
parent ecdebf820f5cbc476437706b43160a5eb37f2ddd

Re-enable test_tags

* Refactor of layout-tags.yaml to single-tenant layout config dir.
* Build tags now added as ansible vars rather than env vars.
* Removes old layout config and custom add_tags function.

Change-Id: I1edfa505df7c9cc1a212f9483fe50ac088f1174e
Signed-off-by: Cullen Taylor <cullentaylor@outlook.com>

tests/unit/test_scheduler.py

diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py
index 45b2257..d44369b 100755
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -2750,11 +2750,9 @@
         self.assertEqual(B.data['status'], 'MERGED')
         self.assertEqual(B.reported, 2)
 
-    @skip("Disabled for early v3 development")
     def test_tags(self):
         "Test job tags"
-        self.config.set('zuul', 'layout_config',
-                        'tests/fixtures/layout-tags.yaml')
+        self.updateConfigLayout('layout-tags')
         self.sched.reconfigure(self.config)
 
         A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
@@ -2763,12 +2761,16 @@
         self.fake_gerrit.addEvent(B.getPatchsetCreatedEvent(1))
         self.waitUntilSettled()
 
-        results = {'project1-merge': 'extratag merge project1',
-                   'project2-merge': 'merge'}
+        self.assertEqual(len(self.history), 8)
+
+        results = {self.getJobFromHistory('merge',
+                   project='org/project1').uuid: 'extratag merge',
+                   self.getJobFromHistory('merge',
+                   project='org/project2').uuid: 'merge'}
 
         for build in self.history:
-            self.assertEqual(results.get(build.name, ''),
-                             build.parameters.get('BUILD_TAGS'))
+            self.assertEqual(results.get(build.uuid, ''),
+                             build.parameters['vars']['zuul'].get('tags'))
 
     def test_timer(self):
         "Test that a periodic job is triggered"