From a71f76d6f68ee82d09cc5fabfab6ae0e7409daef Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Oct 14 2016 13:54:43 +0000 Subject: [PATCH 1/3] Include the close_status in the JSON representation of an issue Adjust the unit-tests for the corresponding change --- diff --git a/pagure/lib/model.py b/pagure/lib/model.py index 08851fa..75653b9 100644 --- a/pagure/lib/model.py +++ b/pagure/lib/model.py @@ -728,6 +728,7 @@ class Issue(BASE): 'title': self.title, 'content': self.content, 'status': self.status, + 'close_status': self.close_status, 'date_created': self.date_created.strftime('%s'), 'closed_at': self.closed_at.strftime( '%s') if self.closed_at else None, diff --git a/tests/test_pagure_flask_api_issue.py b/tests/test_pagure_flask_api_issue.py index 201375a..be86391 100644 --- a/tests/test_pagure_flask_api_issue.py +++ b/tests/test_pagure_flask_api_issue.py @@ -156,6 +156,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "comments": [], "content": "This issue needs attention", "date_created": "1431414800", + "close_status": None, "closed_at": None, "depends": [], "id": 1, @@ -210,6 +211,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "comments": [], "content": "This issue needs attention", "date_created": "1431414800", + "close_status": None, "closed_at": None, "depends": [], "id": 1, @@ -267,6 +269,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "comments": [], "content": "This issue needs attention", "date_created": "1431414800", + "close_status": None, "closed_at": None, "depends": [], "id": 1, @@ -310,6 +313,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "comments": [], "content": "We should work on this", "date_created": "1431414800", + "close_status": None, "closed_at": None, "depends": [], "id": 2, @@ -330,6 +334,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "comments": [], "content": "This issue needs attention", "date_created": "1431414800", + "close_status": None, "closed_at": None, "depends": [], "id": 1, @@ -407,6 +412,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "comments": [], "content": "We should work on this", "date_created": "1431414800", + "close_status": None, "closed_at": None, "depends": [], "id": 2, @@ -427,6 +433,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "comments": [], "content": "This issue needs attention", "date_created": "1431414800", + "close_status": None, "closed_at": None, "depends": [], "id": 1, @@ -486,6 +493,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "comments": [], "content": "This issue needs attention", "date_created": "1431414800", + "close_status": None, "closed_at": None, "depends": [], "id": 1, @@ -578,6 +586,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "comments": [], "content": "We should work on this", "date_created": "1431414800", + "close_status": None, "closed_at": None, "depends": [], "id": 2, @@ -607,6 +616,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests): "comments": [], "content": "We should work on this", "date_created": "1431414800", + "close_status": None, "closed_at": None, "depends": [], "id": 2, diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py index c37fd29..e61b56e 100644 --- a/tests/test_pagure_lib_git.py +++ b/tests/test_pagure_lib_git.py @@ -476,10 +476,11 @@ new file mode 100644 index 0000000..60f7480 --- /dev/null +++ b/456 -@@ -0,0 +1,25 @@ +@@ -0,0 +1,26 @@ +{ + "assignee": null, + "blocks": [], ++ "close_status": null, + "closed_at": null, + "comments": [], + "content": "We should work on this", @@ -561,9 +562,9 @@ diff --git a/123 b/456 index 458821a..77674a8 --- a/123 +++ b/456 -@@ -2,7 +2,25 @@ - "assignee": null, +@@ -3,7 +3,25 @@ "blocks": [], + "close_status": null, "closed_at": null, - "comments": [], + "comments": [ @@ -619,7 +620,7 @@ index 458821a..77674a8 row = '+++ b/456' npatch.append(row) patch = '\n'.join(npatch) - #print patch + print patch self.assertEqual(patch, exp) def test_clean_git(self): From 4b3f68458a8fd72f5ad138c8d91f7f86e96d5af3 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Oct 14 2016 13:55:42 +0000 Subject: [PATCH 2/3] Load the close_status if there is one set in the JSON repsentation given --- diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 0317bb8..3118a60 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -449,6 +449,7 @@ def update_ticket_from_git( issue_uid=issue_uid, private=json_data.get('private'), status=json_data.get('status'), + close_status=json_data.get('close_status'), date_created=datetime.datetime.utcfromtimestamp( float(json_data.get('date_created'))), notify=False, @@ -464,6 +465,7 @@ def update_ticket_from_git( title=json_data.get('title'), content=json_data.get('content'), status=json_data.get('status'), + close_status=json_data.get('close_status'), private=json_data.get('private'), ) session.commit() From 3fe9869314c20cdf474d841c7e12f185c0154e0a Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Oct 14 2016 14:10:28 +0000 Subject: [PATCH 3/3] Let's not print the patch everytime we run - thanks @vivekanand1101 --- diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py index e61b56e..099c73e 100644 --- a/tests/test_pagure_lib_git.py +++ b/tests/test_pagure_lib_git.py @@ -620,7 +620,7 @@ index 458821a..77674a8 row = '+++ b/456' npatch.append(row) patch = '\n'.join(npatch) - print patch + #print patch self.assertEqual(patch, exp) def test_clean_git(self):