From 347c31a00504d0a05ab925d6a0f3bc234b5ec1c0 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Tue, 8 Oct 2019 18:14:22 +0200
Subject: [PATCH] Pagure - add the enqueue_ref unit test

Change-Id: If9b53ea2172a5eb7488612971201e9e3530db025
---
 tests/unit/test_pagure_driver.py       | 22 ++++++++++++++++++++++
 zuul/driver/pagure/pagureconnection.py |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/tests/unit/test_pagure_driver.py b/tests/unit/test_pagure_driver.py
index e79dbb659f..18330fe32b 100644
--- a/tests/unit/test_pagure_driver.py
+++ b/tests/unit/test_pagure_driver.py
@@ -355,6 +355,28 @@ class TestPagureDriver(ZuulTestCase):
                          'SUCCESS')
         self.assertEqual(r, True)
 
+    @simple_layout('layouts/basic-pagure.yaml', driver='pagure')
+    def test_client_enqueue_ref_pagure(self):
+        repo_path = os.path.join(self.upstream_root, 'org/project')
+        repo = git.Repo(repo_path)
+        headsha = repo.head.commit.hexsha
+
+        client = zuul.rpcclient.RPCClient('127.0.0.1',
+                                          self.gearman_server.port)
+        self.addCleanup(client.shutdown)
+        r = client.enqueue_ref(
+            tenant='tenant-one',
+            pipeline='post',
+            project='org/project',
+            trigger='pagure',
+            ref='master',
+            oldrev='90f173846e3af9154517b88543ffbd1691f31366',
+            newrev=headsha)
+        self.waitUntilSettled()
+        self.assertEqual(self.getJobFromHistory('project-post-job').result,
+                         'SUCCESS')
+        self.assertEqual(r, True)
+
     @simple_layout('layouts/requirements-pagure.yaml', driver='pagure')
     def test_pr_score_require_1_vote(self):
 
diff --git a/zuul/driver/pagure/pagureconnection.py b/zuul/driver/pagure/pagureconnection.py
index bfd6407b1c..0b910d2c7a 100644
--- a/zuul/driver/pagure/pagureconnection.py
+++ b/zuul/driver/pagure/pagureconnection.py
@@ -734,7 +734,7 @@ class PagureConnection(BaseConnection):
                 change.branch = event.branch
             else:
                 change = Ref(project)
-
+                change.branch = None
             change.ref = event.ref
             change.oldrev = event.oldrev
             change.newrev = event.newrev