Merge "Fix null ref in github tests" into feature/zuulv3
diff --git a/tests/base.py b/tests/base.py
index 4b06c28..7209c87 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -1001,7 +1001,7 @@
def getPushEvent(self, project, ref, old_rev=None, new_rev=None,
added_files=[], removed_files=[], modified_files=[]):
if not old_rev:
- old_rev = '00000000000000000000000000000000'
+ old_rev = '0' * 40
if not new_rev:
new_rev = random_sha1()
name = 'push'
diff --git a/tests/unit/test_github_driver.py b/tests/unit/test_github_driver.py
index 538de58..a088236 100644
--- a/tests/unit/test_github_driver.py
+++ b/tests/unit/test_github_driver.py
@@ -110,10 +110,8 @@
build_params = self.builds[0].parameters
self.assertEqual('refs/tags/newtag', build_params['zuul']['ref'])
- self.assertEqual('00000000000000000000000000000000',
- build_params['zuul']['oldrev'])
+ self.assertFalse('oldrev' in build_params['zuul'])
self.assertEqual(sha, build_params['zuul']['newrev'])
-
self.executor_server.hold_jobs_in_build = False
self.executor_server.release()
self.waitUntilSettled()