From 274a4b0688c5c104ffb6348dfa7e1f73a6f87221 Mon Sep 17 00:00:00 2001
From: Pilou <pierre-louis@libregerbil.fr>
Date: Wed, 28 Feb 2018 23:22:47 +0100
Subject: [PATCH] gitlab_project: don't ignore errors (#36702)

* gitlab_project: check that errors are reported

* gitlab_project: report encountered errors

Fix #36495
---
 .../modules/source_control/gitlab_project.py  |  9 +-
 test/units/modules/source_control/__init__.py |  0
 .../source_control/test_gitlab_project.py     | 82 +++++++++++++++++++
 3 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 test/units/modules/source_control/__init__.py
 create mode 100644 test/units/modules/source_control/test_gitlab_project.py

diff --git a/lib/ansible/modules/source_control/gitlab_project.py b/lib/ansible/modules/source_control/gitlab_project.py
index f3f798961b..8933924d84 100644
--- a/lib/ansible/modules/source_control/gitlab_project.py
+++ b/lib/ansible/modules/source_control/gitlab_project.py
@@ -187,10 +187,15 @@ class GitLabProject(object):
 
     def createProject(self, is_user, user_id, import_url, arguments):
         if is_user:
-            return self._gitlab.createprojectuser(user_id=user_id, import_url=import_url, **arguments)
+            result = self._gitlab.createprojectuser(user_id=user_id, import_url=import_url, **arguments)
         else:
             group_id = user_id
-            return self._gitlab.createproject(namespace_id=group_id, import_url=import_url, **arguments)
+            result = self._gitlab.createproject(namespace_id=group_id, import_url=import_url, **arguments)
+
+        if not result:
+            self._module.fail_json(msg="Failed to create project %r" % arguments['name'])
+
+        return result
 
     def deleteProject(self, group_name, project_name):
         if self.existsGroup(group_name):
diff --git a/test/units/modules/source_control/__init__.py b/test/units/modules/source_control/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/units/modules/source_control/test_gitlab_project.py b/test/units/modules/source_control/test_gitlab_project.py
new file mode 100644
index 0000000000..f576cf8a29
--- /dev/null
+++ b/test/units/modules/source_control/test_gitlab_project.py
@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2018 Pierre-Louis Bonicoli <pierre-louis@libregerbil.fr>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+import json
+
+from ansible.compat.tests.mock import MagicMock
+from ansible.modules.source_control import gitlab_project
+
+import pytest
+
+
+@pytest.fixture
+def patch_gitlab_project(mocker):
+    mocker.patch.object(gitlab_project, 'HAS_GITLAB_PACKAGE', mocker.PropertyMock(return_value=True))
+
+
+@pytest.mark.parametrize('patch_ansible_module', [{}], indirect=['patch_ansible_module'])
+@pytest.mark.usefixtures('patch_ansible_module')
+def test_without_required_parameters(capfd):
+    """Failure must occurs when all parameters are missing"""
+
+    with pytest.raises(SystemExit):
+        gitlab_project.main()
+    out, err = capfd.readouterr()
+    results = json.loads(out)
+    assert results['failed']
+    assert 'missing required arguments' in results['msg']
+
+
+TEST_CASES = [
+    [
+        {
+            'server_url': 'http://gitlab.test/gitlab',
+            'validate_certs': True,
+            'login_user': 'john',
+            'login_token': 'TOKEN',
+            'name': 'new_test_repo',
+            'group': 'my_repo_group',
+            'public': True,
+            'visibility_level': 20,
+            'issues_enabled': False,
+            'wiki_enabled': True,
+            'snippets_enabled': True,
+            'import_url': 'http://gitlab.test/gitlab/gitrepothatdoesnotexist.git',
+            'state': 'present'
+        },
+        {
+            'msg': "Failed to create project 'new_test_repo'",
+            'failed': True,
+        }
+    ],
+]
+
+
+@pytest.mark.parametrize('patch_ansible_module, testcase', TEST_CASES, indirect=['patch_ansible_module'])
+@pytest.mark.usefixtures('patch_ansible_module')
+def test_fail_if_url_import_doesnt_exist(mocker, capfd, patch_gitlab_project, testcase):
+    """ Test for #36495
+
+    Ensure errors are reported (meaning task report a failure),
+    for example when url_import doesn't exist, an error must occur.
+    """
+
+    git = MagicMock()
+    git.createprojectuser.return_value = False
+
+    gitlab = MagicMock()
+    gitlab.Gitlab.return_value = git
+    gitlab_project.gitlab = gitlab
+
+    with pytest.raises(SystemExit):
+        gitlab_project.main()
+
+    # Check that 1. createprojectuser method has been called 2. with expected parameter
+    assert git.createprojectuser.call_count == 1
+    assert git.createprojectuser.call_args[1]['import_url'] == 'http://gitlab.test/gitlab/gitrepothatdoesnotexist.git'
+
+    out, err = capfd.readouterr()
+    results = json.loads(out)
+    assert results.get('failed') == testcase.get('failed')
+    assert results['msg'] == testcase['msg']