removing test-acceptance-from-core-api and merging core and api beh…

…at config files to use single command to run api tests
owncloud · Aug 29, 2024 · 194e3b8 · 194e3b8
1 parent 7047b41
commit 194e3b8
Show file tree

Hide file tree

Showing 4 changed files with 360 additions and 342 deletions.
diff --git a/.drone.star b/.drone.star
@@ -176,9 +176,40 @@ config = {
         },
     },
     "apiTests": {
-        "numberOfParts": 10,
+        "numberOfParts": 28,
         "skip": False,
         "skipExceptParts": [],
+        "suites": [
+            "coreApiMain",
+            "coreApiAuth",
+            "coreApiCapabilities",
+            "coreApiFavorites",
+            "coreApiShareCreateSpecialToShares1",
+            "coreApiShareCreateSpecialToShares2",
+            "coreApiSharees",
+            "coreApiShareManagementToShares",
+            "coreApiShareManagementBasicToShares",
+            "coreApiShareOperationsToShares1",
+            "coreApiShareOperationsToShares2",
+            "coreApiSharePublicLink1",
+            "coreApiSharePublicLink2",
+            "coreApiShareUpdateToShares",
+            "coreApiTrashbin",
+            "coreApiTrashbinRestore",
+            "coreApiVersions",
+            "coreApiWebdavDelete",
+            "coreApiWebdavLocks",
+            "coreApiWebdavLocks2",
+            "coreApiWebdavMove1",
+            "coreApiWebdavMove2",
+            "coreApiWebdavOperations",
+            "coreApiWebdavPreviews",
+            "coreApiWebdavProperties",
+            "coreApiWebdavUpload",
+            "coreApiWebdavUploadTUS",
+            "coreApiWebdavEtagPropagation1",
+            "coreApiWebdavEtagPropagation2",
+        ],
     },
     "e2eTests": {
         "part": {
@@ -1129,12 +1160,13 @@ def coreApiTests(ctx, part_number = 1, number_of_parts = 1, storage = "ocis", ac
                              "BEHAT_FILTER_TAGS": filterTags,
                              "DIVIDE_INTO_NUM_PARTS": number_of_parts,
                              "RUN_PART": part_number,
+                             "BEHAT_SUITE": config["apiTests"]["suites"][part_number],
                              "EXPECTED_FAILURES_FILE": expectedFailuresFile,
                              "UPLOAD_DELETE_WAIT_TIME": "1" if storage == "owncloud" else 0,
                              "OCIS_WRAPPER_URL": "http://ocis-server:5200",
                          },
                          "commands": [
-                             "make -C %s test-acceptance-from-core-api" % (dirs["base"]),
+                             "make -C %s test-acceptance-api" % (dirs["base"]),
                          ],
                      },
                  ] +

diff --git a/Makefile b/Makefile
@@ -125,17 +125,11 @@ clean-tests:
 BEHAT_BIN=vendor-bin/behat/vendor/bin/behat
 # behat config file for parallel deployment tests
 PARALLEL_BEHAT_YML=tests/parallelDeployAcceptance/config/behat.yml
-# behat config file for core api tests
-CORE_BEHAT_YML=tests/acceptance/config/behat-core.yml
 
 .PHONY: test-acceptance-api
 test-acceptance-api: vendor-bin/behat/vendor
 	BEHAT_BIN=$(BEHAT_BIN) $(PWD)/tests/acceptance/run.sh
 
-.PHONY: test-acceptance-from-core-api
-test-acceptance-from-core-api: vendor-bin/behat/vendor
-	BEHAT_BIN=$(BEHAT_BIN) BEHAT_YML=$(CORE_BEHAT_YML) $(PWD)/tests/acceptance/run.sh --type core-api
-
 .PHONY: test-paralleldeployment-api
 test-paralleldeployment-api: vendor-bin/behat/vendor
 	BEHAT_BIN=$(BEHAT_BIN) BEHAT_YML=$(PARALLEL_BEHAT_YML) $(PWD)/tests/acceptance/run.sh