From e1ff5c61fbe68bd50924522c2a6a94ca711a87b3 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Aug 14 2015 21:19:49 +0000
Subject: Drop the call to create_acls and update the acl identifier for the new ones


---

diff --git a/tests/__init__.py b/tests/__init__.py
index d2ab4e7..fcfbf6a 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -258,22 +258,6 @@ def create_tokens(session, user_id=1):
     session.commit()
 
 
-def create_acls(session):
-    """ Create some acls for the tokens. """
-    for acl in [
-            'issue_create', 'pull_request_merge', 'pull_request_comment',
-            'issue_change_status', 'issue_comment', 'pull_request_close',
-            'pull_request_flag',
-            ]:
-        item = pagure.lib.model.ACL(
-            name=acl,
-            description=acl.replace('_', ' '),
-        )
-        session.add(item)
-
-    session.commit()
-
-
 def create_tokens_acl(session, token_id='aaabbbcccddd'):
     """ Create some acls for the tokens. """
     for aclid in range(7):
diff --git a/tests/test_progit_flask_api_auth.py b/tests/test_progit_flask_api_auth.py
index 2850459..ef76281 100644
--- a/tests/test_progit_flask_api_auth.py
+++ b/tests/test_progit_flask_api_auth.py
@@ -139,7 +139,6 @@ class PagureFlaskApiAuthtests(tests.Modeltests):
         """
         tests.create_projects(self.session)
         tests.create_tokens(self.session)
-        tests.create_acls(self.session)
         tests.create_tokens_acl(self.session)
 
         output = self.app.post('/api/0/test/new_issue')
diff --git a/tests/test_progit_flask_api_fork.py b/tests/test_progit_flask_api_fork.py
index 7047d18..b0bf0fb 100644
--- a/tests/test_progit_flask_api_fork.py
+++ b/tests/test_progit_flask_api_fork.py
@@ -51,7 +51,6 @@ class PagureFlaskApiForktests(tests.Modeltests):
 
         tests.create_projects(self.session)
         tests.create_tokens(self.session)
-        tests.create_acls(self.session)
         tests.create_tokens_acl(self.session)
 
         # Create a pull-request
@@ -167,7 +166,6 @@ class PagureFlaskApiForktests(tests.Modeltests):
 
         tests.create_projects(self.session)
         tests.create_tokens(self.session)
-        tests.create_acls(self.session)
         tests.create_tokens_acl(self.session)
 
         # Create a pull-request
@@ -286,7 +284,6 @@ class PagureFlaskApiForktests(tests.Modeltests):
 
         tests.create_projects(self.session)
         tests.create_tokens(self.session)
-        tests.create_acls(self.session)
         tests.create_tokens_acl(self.session)
 
         # Create the pull-request to close
@@ -357,7 +354,7 @@ class PagureFlaskApiForktests(tests.Modeltests):
         self.session.commit()
         item = pagure.lib.model.TokenAcl(
             token_id='foobar_token',
-            acl_id=6,
+            acl_id=2,
         )
         self.session.add(item)
         self.session.commit()
@@ -399,7 +396,6 @@ class PagureFlaskApiForktests(tests.Modeltests):
 
         tests.create_projects(self.session)
         tests.create_tokens(self.session)
-        tests.create_acls(self.session)
         tests.create_tokens_acl(self.session)
 
         # Create the pull-request to close
@@ -470,7 +466,7 @@ class PagureFlaskApiForktests(tests.Modeltests):
         self.session.commit()
         item = pagure.lib.model.TokenAcl(
             token_id='foobar_token',
-            acl_id=2,
+            acl_id=3,
         )
         self.session.add(item)
         self.session.commit()
@@ -510,7 +506,6 @@ class PagureFlaskApiForktests(tests.Modeltests):
 
         tests.create_projects(self.session)
         tests.create_tokens(self.session)
-        tests.create_acls(self.session)
         tests.create_tokens_acl(self.session)
 
         headers = {'Authorization': 'token aaabbbcccddd'}
@@ -625,7 +620,6 @@ class PagureFlaskApiForktests(tests.Modeltests):
 
         tests.create_projects(self.session)
         tests.create_tokens(self.session)
-        tests.create_acls(self.session)
         tests.create_tokens_acl(self.session)
 
         headers = {'Authorization': 'token aaabbbcccddd'}
diff --git a/tests/test_progit_flask_api_issue.py b/tests/test_progit_flask_api_issue.py
index 0c50434..9eefc5e 100644
--- a/tests/test_progit_flask_api_issue.py
+++ b/tests/test_progit_flask_api_issue.py
@@ -49,7 +49,6 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
         tests.create_projects(self.session)
         tests.create_projects_git(os.path.join(tests.HERE, 'tickets'))
         tests.create_tokens(self.session)
-        tests.create_acls(self.session)
         tests.create_tokens_acl(self.session)
 
         headers = {'Authorization': 'token aaabbbcccddd'}
@@ -553,7 +552,6 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
         tests.create_projects(self.session)
         tests.create_projects_git(os.path.join(tests.HERE, 'tickets'))
         tests.create_tokens(self.session)
-        tests.create_acls(self.session)
         tests.create_tokens_acl(self.session)
 
         headers = {'Authorization': 'token aaabbbcccddd'}
@@ -633,7 +631,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
         # Give `change_status_issue` to this token
         item = pagure.lib.model.TokenAcl(
             token_id='pingou_foo',
-            acl_id=4,
+            acl_id=6,
         )
         self.session.add(item)
         self.session.commit()
@@ -736,7 +734,6 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
 
         tests.create_projects(self.session)
         tests.create_tokens(self.session)
-        tests.create_acls(self.session)
         tests.create_tokens_acl(self.session)
 
         headers = {'Authorization': 'token aaabbbcccddd'}
@@ -863,7 +860,7 @@ class PagureFlaskApiIssuetests(tests.Modeltests):
         # Give `change_status_issue` to this token
         item = pagure.lib.model.TokenAcl(
             token_id='pingou_foo',
-            acl_id=5,
+            acl_id=1,
         )
         self.session.add(item)
         self.session.commit()