Merge branch '1172-rest-endpoint-to-report-users-and-transform-statistics' of https://github.com/ssl-hep/ServiceX into 1172-rest-endpoint-to-report-users-and-transform-statistics

Author: MattShirley

servicex_app/servicex_app_test/test_cli_user_commands.py

@@ -3,8 +3,14 @@
 from servicex_app.cli.user_commands import list_users
 
 
-def _make_user(sub="sub1", email="user@example.com", name="Test User",
-               institution="UChicago", admin=False, pending=False):
+def _make_user(
+    sub="sub1",
+    email="user@example.com",
+    name="Test User",
+    institution="UChicago",
+    admin=False,
+    pending=False,
+):
     user = MagicMock()
     user.sub = sub
     user.email = email
@@ -17,38 +23,50 @@ def _make_user(sub="sub1", email="user@example.com", name="Test User",
 
 class TestListUsers:
     def test_header_includes_admin_column(self, mocker, capsys):
-        mocker.patch("servicex_app.cli.user_commands.UserModel").query.all.return_value = []
+        mocker.patch(
+            "servicex_app.cli.user_commands.UserModel"
+        ).query.all.return_value = []
         list_users()
         assert "Admin" in capsys.readouterr().out
 
     def test_prints_admin_true_for_admin_user(self, mocker, capsys):
         user = _make_user(admin=True)
-        mocker.patch("servicex_app.cli.user_commands.UserModel").query.all.return_value = [user]
+        mocker.patch(
+            "servicex_app.cli.user_commands.UserModel"
+        ).query.all.return_value = [user]
         list_users()
         assert "True" in capsys.readouterr().out
 
     def test_prints_admin_false_for_non_admin_user(self, mocker, capsys):
         user = _make_user(admin=False)
-        mocker.patch("servicex_app.cli.user_commands.UserModel").query.all.return_value = [user]
+        mocker.patch(
+            "servicex_app.cli.user_commands.UserModel"
+        ).query.all.return_value = [user]
         list_users()
         assert "False" in capsys.readouterr().out
 
     def test_prints_pending_status(self, mocker, capsys):
         user = _make_user(pending=True)
-        mocker.patch("servicex_app.cli.user_commands.UserModel").query.all.return_value = [user]
+        mocker.patch(
+            "servicex_app.cli.user_commands.UserModel"
+        ).query.all.return_value = [user]
         list_users()
         assert "Pending" in capsys.readouterr().out
 
     def test_prints_approved_status(self, mocker, capsys):
         user = _make_user(pending=False)
-        mocker.patch("servicex_app.cli.user_commands.UserModel").query.all.return_value = [user]
+        mocker.patch(
+            "servicex_app.cli.user_commands.UserModel"
+        ).query.all.return_value = [user]
         list_users()
         assert "Approved" in capsys.readouterr().out
 
     def test_lists_all_users_without_filter(self, mocker, capsys):
         user1 = _make_user(sub="a", email="a@x.com")
         user2 = _make_user(sub="b", email="b@x.com")
-        mocker.patch("servicex_app.cli.user_commands.UserModel").query.all.return_value = [user1, user2]
+        mocker.patch(
+            "servicex_app.cli.user_commands.UserModel"
+        ).query.all.return_value = [user1, user2]
         list_users()
         out = capsys.readouterr().out
         assert "a@x.com" in out

servicex_app/servicex_app_test/web/admin/test_admin_auth_mixin.py

@@ -58,9 +58,7 @@ def test_is_admin_false_with_jwt_non_admin_user(self, auth_client, mixin, mocker
         with auth_client.application.test_request_context():
             assert mixin._is_admin() is False
 
-    def test_is_admin_false_on_no_authorization_error(
-        self, auth_client, mixin, mocker
-    ):
+    def test_is_admin_false_on_no_authorization_error(self, auth_client, mixin, mocker):
         mocker.patch(
             "servicex_app.web.admin.verify_jwt_in_request",
             side_effect=NoAuthorizationError("no token"),

servicex_app/servicex_app_test/web/admin/test_report_views.py

@@ -54,8 +54,13 @@ def _setup(results):
 
         return _setup
 
-    def _make_mock_user(self, name="Jane Doe", email="jane@example.com",
-                        institution="UChicago", experiment="ATLAS"):
+    def _make_mock_user(
+        self,
+        name="Jane Doe",
+        email="jane@example.com",
+        institution="UChicago",
+        experiment="ATLAS",
+    ):
         user = MagicMock()
         user.name = name
         user.email = email
@@ -71,7 +76,10 @@ def test_write_csv_outputs_header_row(self, mock_db_query):
         output.seek(0)
         rows = list(csv.reader(output))
         assert rows[0] == [
-            "Name", "Email", "Institution", "Experiment",
+            "Name",
+            "Email",
+            "Institution",
+            "Experiment",
             "Transforms (Last 30 Days)",
         ]