diff --git a/tests/test_progit_flask_internal.py b/tests/test_progit_flask_internal.py index 6175610..9931a85 100644 --- a/tests/test_progit_flask_internal.py +++ b/tests/test_progit_flask_internal.py @@ -666,9 +666,9 @@ class PagureFlaskInternaltests(tests.Modeltests): self.assertDictEqual(js_data, exp) @patch('pagure.lib.notify.send_email') - def test_mergeable_request_pull_merge(self, send_email): - """ Test the mergeable_request_pull endpoint when the changes can - be merged with a merge commit. + def test_mergeable_request_pull_conflicts(self, send_email): + """ Test the mergeable_request_pull endpoint when the changes cannot + be merged due to conflicts. """ send_email.return_value = True