From d4b9dbe587329a511e108a67df471f1a40c749ec Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 10 2016 14:44:43 +0000
Subject: Fix unit-tests for the new setting: always_merge


---

diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py
index e15e80a..bba3973 100644
--- a/tests/test_pagure_lib.py
+++ b/tests/test_pagure_lib.py
@@ -887,6 +887,7 @@ class PagureLibtests(tests.Modeltests):
                 'Minimum_score_to_merge_pull-request': -1,
                 'Web-hooks': None,
                 'Enforce_signed-off_commits_in_pull-request': False,
+                'always_merge': False,
             },
             user='pingou',
         )