From 32c462147775ceaee64b25f69f83d1abb45af405 Mon Sep 17 00:00:00 2001 From: Federico Negri Date: Thu, 13 Oct 2022 13:21:16 +0200 Subject: [PATCH 1/4] BUmp versions --- requirements/requirements_doc.txt | 8 ++++---- requirements/requirements_tests.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/requirements_doc.txt b/requirements/requirements_doc.txt index 970cf0316..f08db6b48 100644 --- a/requirements/requirements_doc.txt +++ b/requirements/requirements_doc.txt @@ -1,9 +1,9 @@ -Sphinx==5.1.1 -numpydoc==1.4.0 -ansys-sphinx-theme==0.5.2 +Sphinx==5.2.3 +numpydoc==1.5.0 +ansys-sphinx-theme==0.6.1 sphinx-copybutton==0.5 apispec==5.2.2 sphinxcontrib-httpdomain==1.8.0 sphinxcontrib-globalsubs==0.1.0 sphinxnotes-strike==1.2 -sphinx-autodoc-typehints==1.19.2 \ No newline at end of file +sphinx-autodoc-typehints==1.19.4 \ No newline at end of file diff --git a/requirements/requirements_tests.txt b/requirements/requirements_tests.txt index 547960a0f..f0a257605 100644 --- a/requirements/requirements_tests.txt +++ b/requirements/requirements_tests.txt @@ -1,2 +1,2 @@ pytest==7.1.3 -pytest-cov==3.0.0 +pytest-cov==4.0.0 From 5f2015f346f4005443de0d04978c2972240a7284 Mon Sep 17 00:00:00 2001 From: Federico Negri Date: Thu, 13 Oct 2022 13:41:26 +0200 Subject: [PATCH 2/4] Limit number of jobs to retrieve --- tests/jms/test_jms_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/jms/test_jms_api.py b/tests/jms/test_jms_api.py index bb0daf483..0374c6310 100644 --- a/tests/jms/test_jms_api.py +++ b/tests/jms/test_jms_api.py @@ -51,7 +51,7 @@ def test_jms_api(self): log.debug(f"job_definition={job_def}") log.debug("=== Jobs ===") - all_jobs = project_api.get_jobs(fields="all") + all_jobs = project_api.get_jobs(fields="all", limit=50) log.debug(f"# jobs: {len(all_jobs)}") if all_jobs: log.debug(f"dp0={all_jobs[0]}") From c1ee8dbecc3e5f5ad57af65367eeeff89a6865b8 Mon Sep 17 00:00:00 2001 From: Federico Negri Date: Thu, 13 Oct 2022 14:09:05 +0200 Subject: [PATCH 3/4] Limit jobs query --- tests/jms/test_jms_api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/jms/test_jms_api.py b/tests/jms/test_jms_api.py index 0374c6310..1f8af6f4e 100644 --- a/tests/jms/test_jms_api.py +++ b/tests/jms/test_jms_api.py @@ -56,13 +56,13 @@ def test_jms_api(self): if all_jobs: log.debug(f"dp0={all_jobs[0]}") - pending_jobs = project_api.get_jobs(eval_status="pending") + pending_jobs = project_api.get_jobs(eval_status="pending", limit=50) log.debug(f"Pending jobs: {[j.id for j in pending_jobs]}") # Alternative access with manually instantiated project proj = jms_api.get_projects(id=project.id)[0] project_api = ProjectApi(client, proj.id) - evaluated_jobs = project_api.get_jobs(eval_status="evaluated", fields="all") + evaluated_jobs = project_api.get_jobs(eval_status="evaluated", fields="all", limit=50) log.debug(f"Evaluated jobs: {[j.id for j in evaluated_jobs]}") # Access jobs data without objects From 61619f7e7daafd3f0bf262f09f504638fa4dd70b Mon Sep 17 00:00:00 2001 From: Federico Negri Date: Thu, 13 Oct 2022 14:39:11 +0200 Subject: [PATCH 4/4] Delete test users --- tests/jms/test_project_permissions.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/jms/test_project_permissions.py b/tests/jms/test_project_permissions.py index cddd30135..a06061912 100644 --- a/tests/jms/test_project_permissions.py +++ b/tests/jms/test_project_permissions.py @@ -182,6 +182,8 @@ def test_modify_project_permissions(self): self.assertTrue(except_obj.response.status_code, 403) root_api1.delete_project(proj) + auth_api.delete_user(user1) + auth_api.delete_user(user2) if __name__ == "__main__":