test(api): remove accountsHashDifficulty test suite

.woodpecker.star

@@ -201,13 +201,6 @@ config = {
             ],
             "skip": False,
         },
-        "accountsHashDifficulty": {
-            "skip": False,
-            "suites": [
-                "apiAccountsHashDifficulty",
-            ],
-            "accounts_hash_difficulty": "default",
-        },
         "notification": {
             "suites": [
                 "apiNotification",
@@ -667,10 +660,10 @@ def testPipelines(ctx):
         storage = "decomposed"
 
     if "skip" not in config["cs3ApiTests"] or not config["cs3ApiTests"]["skip"]:
-        pipelines += cs3ApiTests(ctx, storage, "default")
+        pipelines += cs3ApiTests(ctx, storage)
     if "skip" not in config["wopiValidatorTests"] or not config["wopiValidatorTests"]["skip"]:
-        pipelines += wopiValidatorTests(ctx, storage, "builtin", "default")
-        pipelines += wopiValidatorTests(ctx, storage, "cs3", "default")
+        pipelines += wopiValidatorTests(ctx, storage, "builtin")
+        pipelines += wopiValidatorTests(ctx, storage, "cs3")
 
     pipelines += localApiTestPipeline(ctx)
     pipelines += coreApiTestPipeline(ctx)
@@ -1059,12 +1052,12 @@ def codestyle(ctx):
 
     return pipelines
 
-def cs3ApiTests(ctx, storage, accounts_hash_difficulty = 4):
+def cs3ApiTests(ctx, storage):
     pipeline = {
         "name": "test-cs3-API-%s" % storage,
         "steps": evaluateWorkflowStep() +
                  restoreBuildArtifactCache(ctx, dirs["opencloudBinArtifact"], dirs["opencloudBinPath"]) +
-                 opencloudServer(storage, accounts_hash_difficulty, deploy_type = "cs3api_validator") +
+                 opencloudServer(storage, deploy_type = "cs3api_validator") +
                  [
                      {
                          "name": "cs3ApiTests",
@@ -1095,7 +1088,7 @@ def cs3ApiTests(ctx, storage, accounts_hash_difficulty = 4):
     ])
     return [pipeline]
 
-def wopiValidatorTests(ctx, storage, wopiServerType, accounts_hash_difficulty = 4):
+def wopiValidatorTests(ctx, storage, wopiServerType):
     testgroups = [
         "BaseWopiViewing",
         "CheckFileInfoSchema",
@@ -1173,7 +1166,7 @@ def wopiValidatorTests(ctx, storage, wopiServerType, accounts_hash_difficulty =
         "steps": evaluateWorkflowStep() +
                  restoreBuildArtifactCache(ctx, dirs["opencloudBinArtifact"], dirs["opencloudBinPath"]) +
                  waitForServices("fake-office", ["fakeoffice:8080"]) +
-                 opencloudServer(storage, accounts_hash_difficulty, deploy_type = "wopi_validator", extra_server_environment = extra_server_environment) +
+                 opencloudServer(storage, deploy_type = "wopi_validator", extra_server_environment = extra_server_environment) +
                  wopiServer +
                  waitForServices("wopi-fakeoffice", ["wopi-fakeoffice:9300"]) +
                  [
@@ -1224,7 +1217,6 @@ def localApiTestPipeline(ctx):
         "extraTestEnvironment": {},
         "extraServerEnvironment": {},
         "storages": ["posix"],
-        "accounts_hash_difficulty": 4,
         "emailNeeded": False,
         "antivirusNeeded": False,
         "tikaNeeded": False,
@@ -1281,13 +1273,12 @@ def localApiTestPipeline(ctx):
                                          (waitForLdapService() if params["ldapNeeded"] else []) +
                                          opencloudServer(
                                              storage,
-                                             params["accounts_hash_difficulty"],
                                              extra_server_environment = params["extraServerEnvironment"],
                                              with_wrapper = True,
                                              tika_enabled = params["tikaNeeded"],
                                              watch_fs_enabled = run_with_watch_fs_enabled,
                                          ) +
-                                         (opencloudServer(storage, params["accounts_hash_difficulty"], deploy_type = "federation", extra_server_environment = params["extraServerEnvironment"], watch_fs_enabled = run_with_watch_fs_enabled) if params["federationServer"] else []) +
+                                         (opencloudServer(storage, deploy_type = "federation", extra_server_environment = params["extraServerEnvironment"], watch_fs_enabled = run_with_watch_fs_enabled) if params["federationServer"] else []) +
                                          ((wopiCollaborationService("fakeoffice") + wopiCollaborationService("collabora") + wopiCollaborationService("onlyoffice")) if params["collaborationServiceNeeded"] else []) +
                                          (openCloudHealthCheck("wopi", ["wopi-collabora:9304", "wopi-onlyoffice:9304", "wopi-fakeoffice:9304"]) if params["collaborationServiceNeeded"] else []) +
                                          localApiTest(params["suites"], storage, params["extraTestEnvironment"], run_with_remote_php, params["generateVirusFiles"]) +
@@ -1366,7 +1357,6 @@ def coreApiTestPipeline(ctx):
         "numberOfParts": 7,
         "skipExceptParts": [],
         "skip": False,
-        "accounts_hash_difficulty": 4,
     }
 
     pipelines = []
@@ -1412,7 +1402,6 @@ def coreApiTestPipeline(ctx):
                                          restoreBuildArtifactCache(ctx, dirs["opencloudBinArtifact"], dirs["opencloudBinPath"]) +
                                          opencloudServer(
                                              storage,
-                                             params["accounts_hash_difficulty"],
                                              with_wrapper = True,
                                              watch_fs_enabled = run_with_watch_fs_enabled,
                                          ) +
@@ -2330,7 +2319,7 @@ def notifyMatrix(ctx):
 
     return result
 
-def opencloudServer(storage = "decomposed", accounts_hash_difficulty = 4, depends_on = [], deploy_type = "", extra_server_environment = {}, with_wrapper = False, tika_enabled = False, watch_fs_enabled = False):
+def opencloudServer(storage = "decomposed", depends_on = [], deploy_type = "", extra_server_environment = {}, with_wrapper = False, tika_enabled = False, watch_fs_enabled = False):
     user = "0:0"
     container_name = OC_SERVER_NAME
     environment = {
@@ -2426,13 +2415,6 @@ def opencloudServer(storage = "decomposed", accounts_hash_difficulty = 4, depend
     if watch_fs_enabled:
         environment["STORAGE_USERS_POSIX_WATCH_FS"] = True
 
-    # Pass in "default" accounts_hash_difficulty to not set this environment variable.
-    # That will allow OpenCloud to use whatever its built-in default is.
-    # Otherwise pass in a value from 4 to about 11 or 12 (default 4, for making regular tests fast)
-    # The high values cause lots of CPU to be used when hashing passwords, and really slow down the tests.
-    if accounts_hash_difficulty != "default":
-        environment["ACCOUNTS_HASH_DIFFICULTY"] = accounts_hash_difficulty
-
     for item in extra_server_environment:
         environment[item] = extra_server_environment[item]
 

tests/acceptance/config/behat.yml

@@ -3,9 +3,9 @@ default:
     "": "%paths.base%/../bootstrap"
 
   suites:
-    apiAccountsHashDifficulty:
+    apiSpaces:
       paths:
-        - "%paths.base%/../features/apiAccountsHashDifficulty"
+        - "%paths.base%/../features/apiSpaces"
       context: &common_ldap_suite_context
         parameters:
           ldapAdminPassword: admin
@@ -18,21 +18,6 @@ default:
             adminPassword: admin
             regularUserPassword: 123456
         - SettingsContext:
-        - GraphContext:
-        - SpacesContext:
-        - CapabilitiesContext:
-        - FilesVersionsContext:
-        - NotificationContext:
-        - OCSContext:
-        - PublicWebDavContext:
-
-    apiSpaces:
-      paths:
-        - "%paths.base%/../features/apiSpaces"
-      context: *common_ldap_suite_context
-      contexts:
-        - FeatureContext: *common_feature_context_params
-        - SettingsContext:
         - SpacesContext:
         - CapabilitiesContext:
         - FilesVersionsContext:
@@ -442,7 +427,7 @@ default:
         - AuthAppContext:
         - CliContext:
         - OcConfigContext:
-    
+
     apiTenancy:
       paths:
         - "%paths.base%/../features/apiTenancy"

tests/acceptance/docker/src/opencloud-base.yml

@@ -14,7 +14,6 @@ services:
       SHARING_USER_JSON_FILE: /srv/app/tmp/opencloud/shares.json
       PROXY_ENABLE_BASIC_AUTH: "true"
       WEB_UI_CONFIG_FILE: /woodpecker/src/github.com/opencloud-eu/opencloud/tests/config/woodpecker/opencloud-config.json
-      ACCOUNTS_HASH_DIFFICULTY: 4
       OC_INSECURE: "true"
       IDM_CREATE_DEMO_USERS: "true"
       IDM_ADMIN_PASSWORD: "admin"

tests/acceptance/expected-failures-decomposed-storage.md

@@ -19,8 +19,6 @@
 
 #### [Settings service user can list other peoples assignments](https://github.com/owncloud/ocis/issues/5032)
 
-- [apiAccountsHashDifficulty/assignRole.feature:27](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAccountsHashDifficulty/assignRole.feature#L27)
-- [apiAccountsHashDifficulty/assignRole.feature:28](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAccountsHashDifficulty/assignRole.feature#L28)
 - [apiGraph/getAssignedRole.feature:31](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraph/getAssignedRole.feature#L31)
 - [apiGraph/getAssignedRole.feature:32](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraph/getAssignedRole.feature#L32)
 - [apiGraph/getAssignedRole.feature:33](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraph/getAssignedRole.feature#L33)

tests/acceptance/expected-failures-posix-storage.md

@@ -19,8 +19,6 @@
 
 #### [Settings service user can list other peoples assignments](https://github.com/owncloud/ocis/issues/5032)
 
-- [apiAccountsHashDifficulty/assignRole.feature:27](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAccountsHashDifficulty/assignRole.feature#L27)
-- [apiAccountsHashDifficulty/assignRole.feature:28](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAccountsHashDifficulty/assignRole.feature#L28)
 - [apiGraph/getAssignedRole.feature:31](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraph/getAssignedRole.feature#L31)
 - [apiGraph/getAssignedRole.feature:32](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraph/getAssignedRole.feature#L32)
 - [apiGraph/getAssignedRole.feature:33](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiGraph/getAssignedRole.feature#L33)

tests/acceptance/scripts/run_api_tests.sh

@@ -64,7 +64,6 @@ SUITES=(
     "apiSharingNgShareInvitation"
     "apiSharingNgLinkSharePermission"
     "apiSharingNgLinkShareRoot"
-    "apiAccountsHashDifficulty"
     "apiSearchContent"
     "apiNotification"
 )