From a823f7d5efb3eac4ebdbca756d93f06de3e0f716 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 19 2015 09:54:40 +0000 Subject: [PATCH 1/4] Add debugging code for jenkins --- diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 313a1c2..3d9ed26 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -330,6 +330,7 @@ def get_project_from_json( if not project: parent = None if jsondata.get('parent'): + print jsondata parent = get_project_from_json( session, jsondata.get('parent'), gitfolder, forkfolder, docfolder, ticketfolder, requestfolder) From fd747d34d3f5b9282946c7dca7622b2cdbe89b53 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 19 2015 10:42:02 +0000 Subject: [PATCH 2/4] Create the git repos and adjust the configuration folders --- diff --git a/tests/test_progit_lib_git.py b/tests/test_progit_lib_git.py index a8d174b..047257e 100644 --- a/tests/test_progit_lib_git.py +++ b/tests/test_progit_lib_git.py @@ -34,7 +34,17 @@ class PagureLibGittests(tests.Modeltests): """ Set up the environnment, ran before every tests. """ super(PagureLibGittests, self).setUp() - pagure.APP.config['FORK_FOLDER'] = os.path.join(tests.HERE, 'forks') + pagure.lib.git.SESSION = self.session + pagure.APP.config['GIT_FOLDER'] = os.path.join( + tests.HERE, 'repos') + pagure.APP.config['FORK_FOLDER'] = os.path.join( + tests.HERE, 'forks') + pagure.APP.config['TICKETS_FOLDER'] = os.path.join( + tests.HERE, 'tickets') + pagure.APP.config['DOCS_FOLDER'] = os.path.join( + tests.HERE, 'docs') + pagure.APP.config['REQUESTS_FOLDER'] = os.path.join( + tests.HERE, 'requests') def test_write_gitolite_acls(self): """ Test the write_gitolite_acls function of pagure.lib.git. """ @@ -817,6 +827,7 @@ index 0000000..60f7480 def test_update_request_from_git(self): """ Test the update_request_from_git method from pagure.lib.git. """ tests.create_projects(self.session) + tests.create_projects_git(os.path.join(tests.HERE, 'repos')) repo = pagure.lib.get_project(self.session, 'test') From 87cd2e9d9ad4b2d8bd7e6875d221959938bf9403 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 19 2015 10:42:35 +0000 Subject: [PATCH 3/4] Remove debugging code --- diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 3d9ed26..313a1c2 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -330,7 +330,6 @@ def get_project_from_json( if not project: parent = None if jsondata.get('parent'): - print jsondata parent = get_project_from_json( session, jsondata.get('parent'), gitfolder, forkfolder, docfolder, ticketfolder, requestfolder) From 700d020f74cc942c891619b5b975e70af2ff76d6 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 19 2015 10:48:02 +0000 Subject: [PATCH 4/4] Invert the users in the JSON data as we are otherwise forking one of our own repo In tests.create_projects() we create the test project as belonging to the user pingou, so the jsondata in the tests should correspond to this otherwise we end up trying to fork our own project which is not allowed --- diff --git a/tests/test_progit_lib_git.py b/tests/test_progit_lib_git.py index 047257e..bb947c1 100644 --- a/tests/test_progit_lib_git.py +++ b/tests/test_progit_lib_git.py @@ -848,10 +848,12 @@ index 0000000..60f7480 "name": "test", "date_created": "1426500194", "user": { - "fullname": "fake user", - "name": "fake", - "default_email": "fake@fedoraproject.org", - "emails": ["fake@fedoraproject.org"] + "fullname": "Pierre-YvesChibon", + "name": "pingou", + "default_email": "pingou@fedoraproject.org", + "emails": [ + "pingou@fedoraproject.org" + ] }, "id": 1, "description": "test project" @@ -924,11 +926,11 @@ index 0000000..60f7480 "name": "test", "date_created": "1426500194", "user": { - "fullname": "fake user", - "name": "fake", - "default_email": "fake@fedoraproject.org", + "fullname": "Pierre-YvesChibon", + "name": "pingou", + "default_email": "pingou@fedoraproject.org", "emails": [ - "fake@fedoraproject.org" + "pingou@fedoraproject.org" ] }, "settings": { @@ -947,11 +949,11 @@ index 0000000..60f7480 "name": "test", "date_created": "1426843440", "user": { - "fullname": "Pierre-YvesChibon", - "name": "pingou", - "default_email": "pingou@fedoraproject.org", + "fullname": "fake user", + "name": "fake", + "default_email": "fake@fedoraproject.org", "emails": [ - "pingou@fedoraproject.org" + "fake@fedoraproject.org" ] }, "id": 6, @@ -1006,10 +1008,12 @@ index 0000000..60f7480 "name": "test", "date_created": "1426500194", "user": { - "fullname": "fake user", - "name": "fake", - "default_email": "fake@fedoraproject.org", - "emails": ["fake@fedoraproject.org"] + "fullname": "Pierre-YvesChibon", + "name": "pingou", + "default_email": "pingou@fedoraproject.org", + "emails": [ + "pingou@fedoraproject.org" + ] }, "settings": { "issue_tracker": True, @@ -1037,11 +1041,11 @@ index 0000000..60f7480 "name": "test", "date_created": "1426500194", "user": { - "fullname": "fake user", - "name": "fake", - "default_email": "fake@fedoraproject.org", + "fullname": "Pierre-YvesChibon", + "name": "pingou", + "default_email": "pingou@fedoraproject.org", "emails": [ - "fake@fedoraproject.org" + "pingou@fedoraproject.org" ] }, "settings": { @@ -1060,11 +1064,11 @@ index 0000000..60f7480 "name": "test", "date_created": "1426843440", "user": { - "fullname": "Pierre-YvesChibon", - "name": "pingou", - "default_email": "pingou@fedoraproject.org", + "fullname": "fake user", + "name": "fake", + "default_email": "fake@fedoraproject.org", "emails": [ - "pingou@fedoraproject.org" + "fake@fedoraproject.org" ] }, "project_docs": True,