commit e3db295493f4c6c9db106636b96189eb8086e28f
author James E. Blair <jeblair@redhat.com> Fri Jul 21 15:03:36 2017 -0700
committer James E. Blair <jeblair@redhat.com> Fri Jul 21 15:03:36 2017 -0700
tree 1c2cd0b1d6972ed9a86fda9d6096bffb901c4e3f
parent ee9c8c6cba3dbd6cc3685dfca88d68d3f0dbbf1a

Remove ZUUL_CHANGE

Removing old ZUUL_ env variables which have been replaced with
Ansible variables.

While we're at it, ensure that zuul.change and zuul.patchset are
both rendered to Ansible as strings so that we don't build any
unecessary assumptions about the type of those values.

Change-Id: I3de53c58ac2c5a35547e22a79b8b42558610284a

tests/unit/test_github_driver.py

diff --git a/tests/unit/test_github_driver.py b/tests/unit/test_github_driver.py
index a28abb1..875a9d7 100644
--- a/tests/unit/test_github_driver.py
+++ b/tests/unit/test_github_driver.py
@@ -36,8 +36,6 @@
 
         build_params = self.builds[0].parameters
         self.assertEqual('master', build_params['ZUUL_BRANCH'])
-        self.assertEqual(str(A.number), build_params['ZUUL_CHANGE'])
-        self.assertEqual(A.head_sha, build_params['zuul']['patchset'])
 
         self.executor_server.hold_jobs_in_build = False
         self.executor_server.release()
@@ -50,8 +48,8 @@
 
         job = self.getJobFromHistory('project-test2')
         zuulvars = job.parameters['zuul']
-        self.assertEqual(A.number, zuulvars['change'])
-        self.assertEqual(A.head_sha, zuulvars['patchset'])
+        self.assertEqual(str(A.number), zuulvars['change'])
+        self.assertEqual(str(A.head_sha), zuulvars['patchset'])
         self.assertEqual(1, len(A.comments))
         self.assertEqual(2, len(self.history))
 

tests/unit/test_scheduler.py

diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py
index f54465d..1e0affc 100755
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -1283,7 +1283,7 @@
 
         self.executor_server.hold_jobs_in_build = False
         for build in self.builds:
-            if build.parameters['ZUUL_CHANGE'] != '1':
+            if build.parameters['zuul']['change'] != '1':
                 build.release()
                 self.waitUntilSettled()
 
@@ -2035,13 +2035,13 @@
 
         a_build = b_build = c_build = d_build = None
         for x in self.builds:
-            if x.parameters['ZUUL_CHANGE'] == '3':
+            if x.parameters['zuul']['change'] == '3':
                 a_build = x
-            elif x.parameters['ZUUL_CHANGE'] == '4':
+            elif x.parameters['zuul']['change'] == '4':
                 b_build = x
-            elif x.parameters['ZUUL_CHANGE'] == '5':
+            elif x.parameters['zuul']['change'] == '5':
                 c_build = x
-            elif x.parameters['ZUUL_CHANGE'] == '6':
+            elif x.parameters['zuul']['change'] == '6':
                 d_build = x
             if a_build and b_build and c_build and d_build:
                 break