From cdb7db464b0ccbf450d8dfa6a2ee75fddd62471f Mon Sep 17 00:00:00 2001 From: "don.sizemore" Date: Fri, 28 May 2021 15:13:18 -0400 Subject: [PATCH 1/2] #7897 add phil's authoritative list of ITs for docker-aio and dataverse-ansible --- conf/docker-aio/run-test-suite.sh | 4 +++- tests/integration-tests.txt | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 tests/integration-tests.txt diff --git a/conf/docker-aio/run-test-suite.sh b/conf/docker-aio/run-test-suite.sh index bf0683fdbd4..19d05154a17 100755 --- a/conf/docker-aio/run-test-suite.sh +++ b/conf/docker-aio/run-test-suite.sh @@ -6,6 +6,8 @@ if [ -z "$dvurl" ]; then dvurl="http://localhost:8084" fi +integrationtests=$(<../../tests/integration-tests.txt) + # Please note the "dataverse.test.baseurl" is set to run for "all-in-one" Docker environment. # TODO: Rather than hard-coding the list of "IT" classes here, add a profile to pom.xml. -source maven/maven.sh && mvn test -Dtest=DataversesIT,DatasetsIT,SwordIT,AdminIT,BuiltinUsersIT,UsersIT,UtilIT,ConfirmEmailIT,FileMetadataIT,FilesIT,SearchIT,InReviewWorkflowIT,HarvestingServerIT,MoveIT,MakeDataCountApiIT,FileTypeDetectionIT,EditDDIIT,ExternalToolsIT,AccessIT,DuplicateFilesIT,DownloadFilesIT,LinkIT,DeleteUsersIT,DeactivateUsersIT,AuxiliaryFilesIT -Ddataverse.test.baseurl=$dvurl +mvn test -Dtest=$integrationtests -Ddataverse.test.baseurl=$dvurl diff --git a/tests/integration-tests.txt b/tests/integration-tests.txt new file mode 100644 index 00000000000..d6edfa4d70e --- /dev/null +++ b/tests/integration-tests.txt @@ -0,0 +1 @@ +DataversesIT,DatasetsIT,SwordIT,AdminIT,BuiltinUsersIT,UsersIT,UtilIT,ConfirmEmailIT,FileMetadataIT,FilesIT,SearchIT,InReviewWorkflowIT,HarvestingServerIT,MoveIT,MakeDataCountApiIT,FileTypeDetectionIT,EditDDIIT,ExternalToolsIT,AccessIT,DuplicateFilesIT,DownloadFilesIT,LinkIT,DeleteUsersIT,DeactivateUsersIT,AuxiliaryFilesIT From f2a4d46ac4799c76eb39221540956b27679bdc16 Mon Sep 17 00:00:00 2001 From: Philip Durbin Date: Fri, 28 May 2021 15:40:32 -0400 Subject: [PATCH 2/2] mention new IT test list in dev guide #7897 Also remove reference to phoenix server, which has been decommissioned. We'll finished cleaning up phoenix-related docs in #7031. --- doc/sphinx-guides/source/developers/testing.rst | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/doc/sphinx-guides/source/developers/testing.rst b/doc/sphinx-guides/source/developers/testing.rst index bbfac33fcda..e7bc6b2fed5 100755 --- a/doc/sphinx-guides/source/developers/testing.rst +++ b/doc/sphinx-guides/source/developers/testing.rst @@ -246,7 +246,7 @@ Once installed, you may run commands with ``mvn [options] [] [`. +If you are adding a new test class, be sure to add it to :download:`tests/integration-tests.txt <../../../../tests/integration-tests.txt>` so that our automated testing knows about it. Writing and Using a Testcontainers Test @@ -438,13 +438,6 @@ How to Run the Phoenix Tests - Log into Jenkins and click "Build Now" at https://build.hmdc.harvard.edu:8443/job/phoenix.dataverse.org-build-develop/ - Wait for all three chained Jenkins jobs to complete and note if they passed or failed. If you see a failure, open a GitHub issue or at least get the attention of some developers. -List of Tests Run Against the Phoenix Server -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -We haven't thought much about a good way to publicly list the "IT" classes that are executed against the phoenix server. (Currently your best bet is to look at the ``Executing Maven`` line at the top of the "Full Log" of "Console Output" of ``phoenix.dataverse.org-apitest-develop`` Jenkins job mentioned above.) We endeavor to keep the list of tests in the "all-in-one" Docker environment described above in sync with the list of tests configured in Jenkins. That is to say, refer to :download:`run-test-suite.sh <../../../../conf/docker-aio/run-test-suite.sh>` mentioned in ``conf/docker-aio/readme.md`` for the current list of IT tests that are expected to pass. Here's a dump of that file: - -.. literalinclude:: ../../../../conf/docker-aio/run-test-suite.sh - Accessibility Testing ---------------------