From b0733619912a1f8a2c2d52a660b0a0b409799891 Mon Sep 17 00:00:00 2001
From: farhaanbukhsh <farhaan.bukhsh@gmail.com>
Date: Jul 20 2016 16:57:57 +0000
Subject: Fix test after rebase


---

diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index fc3fd0e..44513fc 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -981,7 +981,7 @@ def new_project(session, user, name, blacklist, allowed_prefix,
                 gitfolder, docfolder, ticketfolder, requestfolder,
                 description=None, url=None, avatar_email=None,
                 parent_id=None, add_readme=False, userobj=None,
-                prevent_40_chars=False):
+                private=False, prevent_40_chars=False):
     ''' Create a new project based on the information provided.
     '''
     if name in blacklist:
diff --git a/tests/test_pagure_flask_api_ui_private_repo.py b/tests/test_pagure_flask_api_ui_private_repo.py
index 22b454b..cdadf0e 100644
--- a/tests/test_pagure_flask_api_ui_private_repo.py
+++ b/tests/test_pagure_flask_api_ui_private_repo.py
@@ -1340,7 +1340,7 @@ class PagurePrivateRepotest(tests.Modeltests):
         self.session.commit()
         item = pagure.lib.model.TokenAcl(
             token_id='foobar_token',
-            acl_id=2,
+            acl_id=7,
         )
         self.session.add(item)
         self.session.commit()
@@ -1474,7 +1474,7 @@ class PagurePrivateRepotest(tests.Modeltests):
         self.session.commit()
         item = pagure.lib.model.TokenAcl(
             token_id='foobar_token',
-            acl_id=3,
+            acl_id=10,
         )
         self.session.add(item)
         self.session.commit()
@@ -1650,6 +1650,7 @@ class PagurePrivateRepotest(tests.Modeltests):
                         {
                             "assignee": None,
                             "blocks": [],
+                            "closed_at": None,
                             "comments": [],
                             "content": "This issue needs attention",
                             "date_created": "1431414800",
@@ -1697,6 +1698,7 @@ class PagurePrivateRepotest(tests.Modeltests):
                  {'assignee': None, 'author': None, 'status': None, 'tags': []},
                  'issues': [{u'assignee': None,
                              'blocks': [],
+                             'closed_at': None,
                              'comments': [],
                              'content': 'This issue needs attention',
                              'date_created': '1431414800',
@@ -1710,6 +1712,7 @@ class PagurePrivateRepotest(tests.Modeltests):
                              'user': {'fullname': 'PY C', 'name': 'pingou'}},
                             {'assignee': None,
                              'blocks': [],
+                             'closed_at': None,
                              'comments': [],
                              'content': 'We should work on this',
                              'date_created': '1431414800',
@@ -1751,6 +1754,7 @@ class PagurePrivateRepotest(tests.Modeltests):
                     {
                         "assignee": None,
                         "blocks": [],
+                        "closed_at": None,
                         "comments": [],
                         "content": "This issue needs attention",
                         "date_created": "1431414800",
@@ -1769,6 +1773,7 @@ class PagurePrivateRepotest(tests.Modeltests):
                     {
                         "assignee": None,
                         "blocks": [],
+                        "closed_at": None,
                         "comments": [],
                         "content": "We should work on this",
                         "date_created": "1431414800",
@@ -1847,6 +1852,7 @@ class PagurePrivateRepotest(tests.Modeltests):
                     {
                         "assignee": None,
                         "blocks": [],
+                        "closed_at": None,
                         "comments": [],
                         "content": "This issue needs attention",
                         "date_created": "1431414800",
@@ -1865,6 +1871,7 @@ class PagurePrivateRepotest(tests.Modeltests):
                     {
                         "assignee": None,
                         "blocks": [],
+                        "closed_at": None,
                         "comments": [],
                         "content": "We should work on this",
                         "date_created": "1431414800",
@@ -1938,6 +1945,7 @@ class PagurePrivateRepotest(tests.Modeltests):
                 {
                     "assignee": None,
                     "blocks": [],
+                    "closed_at":None,
                     "comments": [],
                     "content": "This issue needs attention",
                     "date_created": "1431414800",
@@ -1981,6 +1989,7 @@ class PagurePrivateRepotest(tests.Modeltests):
             {
                 "assignee": None,
                 "blocks": [],
+                "closed_at":None,
                 "comments": [],
                 "content": "This issue needs attention",
                 "date_created": "1431414800",
@@ -2294,6 +2303,7 @@ class PagurePrivateRepotest(tests.Modeltests):
                     "avatar_url": "https://seccdn.libravatar.org/avatar/...",
                     "comment": "This is a very interesting question",
                     "comment_date": "2015-07-02 09:22",
+                    "notification":False,
                     "date_created": "1435821770",
                     "edited_on": None,
                     "editor": None,
@@ -2319,6 +2329,7 @@ class PagurePrivateRepotest(tests.Modeltests):
                     "avatar_url": "https://seccdn.libravatar.org/avatar/...",
                     "comment": "This is a very interesting question",
                     "comment_date": "2015-07-02 09:22",
+                    "notification":False,
                     "date_created": "1435821770",
                     "edited_on": None,
                     "editor": None,