This is an automated email from the ASF dual-hosted git repository.
uranusjr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 292751c Make sure create_user arguments are keyword-ed (#18248)
292751c is described below
commit 292751c2581d65c279886622e07c03819d2c9bda
Author: Tzu-ping Chung <t...@astronomer.io>
AuthorDate: Wed Sep 15 08:39:06 2021 +0800
Make sure create_user arguments are keyword-ed (#18248)
---
tests/test_utils/api_connexion_utils.py | 2 +-
tests/www/test_security.py | 32 ++++++++++++++++----------------
tests/www/views/conftest.py | 2 +-
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/tests/test_utils/api_connexion_utils.py
b/tests/test_utils/api_connexion_utils.py
index 39a072b..e15d288 100644
--- a/tests/test_utils/api_connexion_utils.py
+++ b/tests/test_utils/api_connexion_utils.py
@@ -18,7 +18,7 @@ from airflow.api_connexion.exceptions import
EXCEPTIONS_LINK_MAP
from airflow.www.security import EXISTING_ROLES
-def create_user(app, username, role_name, email=None, permissions=None):
+def create_user(app, *, username, role_name, email=None, permissions=None):
appbuilder = app.appbuilder
# Removes user and role so each test has isolated test data.
diff --git a/tests/www/test_security.py b/tests/www/test_security.py
index eab27ba..9d1db20 100644
--- a/tests/www/test_security.py
+++ b/tests/www/test_security.py
@@ -336,8 +336,8 @@ class TestSecurity(unittest.TestCase):
with self.app.app_context():
user = api_connexion_utils.create_user(
self.app,
- username,
- role_name,
+ username=username,
+ role_name=role_name,
permissions=[
(role_perm, role_vm),
],
@@ -355,8 +355,8 @@ class TestSecurity(unittest.TestCase):
with self.app.app_context():
user = api_connexion_utils.create_user(
self.app,
- "current_user_has_permissions",
- "current_user_has_permissions",
+ username="current_user_has_permissions",
+ role_name="current_user_has_permissions",
permissions=[("can_some_action", "SomeBaseView")],
)
role = user.roles[0]
@@ -379,8 +379,8 @@ class TestSecurity(unittest.TestCase):
user = api_connexion_utils.create_user(
self.app,
- username,
- role_name,
+ username=username,
+ role_name=role_name,
permissions=[
(permissions.ACTION_CAN_READ, permissions.RESOURCE_DAG),
(permissions.ACTION_CAN_READ, permissions.RESOURCE_DAG),
@@ -407,8 +407,8 @@ class TestSecurity(unittest.TestCase):
user = api_connexion_utils.create_user(
self.app,
- username,
- role_name,
+ username=username,
+ role_name=role_name,
permissions=[
(permissions.ACTION_CAN_EDIT, permissions.RESOURCE_DAG),
],
@@ -473,8 +473,8 @@ class TestSecurity(unittest.TestCase):
with self.app.app_context():
user = api_connexion_utils.create_user(
self.app,
- username,
- role_name,
+ username=username,
+ role_name=role_name,
permissions=[
(permissions.ACTION_CAN_READ, permissions.RESOURCE_DAG),
(permissions.ACTION_CAN_READ, permissions.RESOURCE_DAG),
@@ -512,8 +512,8 @@ class TestSecurity(unittest.TestCase):
with self.app.app_context():
user = api_connexion_utils.create_user(
self.app,
- username,
- role_name,
+ username=username,
+ role_name=role_name,
permissions=[],
)
self.expect_user_is_in_role(user, rolename='team-a')
@@ -540,8 +540,8 @@ class TestSecurity(unittest.TestCase):
with self.app.app_context():
user = api_connexion_utils.create_user(
self.app,
- username,
- role_name,
+ username=username,
+ role_name=role_name,
permissions=[],
)
self.expect_user_is_in_role(user, rolename='team-a')
@@ -692,8 +692,8 @@ class TestSecurity(unittest.TestCase):
]
user = api_connexion_utils.create_user(
self.app,
- username,
- role_name,
+ username=username,
+ role_name=role_name,
)
self.security_manager.bulk_sync_roles(mock_roles)
self.security_manager._sync_dag_view_permissions(
diff --git a/tests/www/views/conftest.py b/tests/www/views/conftest.py
index 54e46b6..05fe1e4 100644
--- a/tests/www/views/conftest.py
+++ b/tests/www/views/conftest.py
@@ -117,7 +117,7 @@ def user_client(app):
@pytest.fixture(scope="module")
def client_factory(app):
def factory(name, role_name, permissions):
- create_user(app, name, role_name, permissions)
+ create_user(app, username=name, role_name=role_name,
permissions=permissions)
client = app.test_client()
resp = client.post("/login/", data={"username": name, "password":
name})
assert resp.status_code == 302
