join singular small test into this mixed suite execution (#22173)

dothebart · web-flow · commit 579a07ada240 · 2025-12-12T12:49:58.000+01:00
* join singular small test into this mixed suite execution

* choose default cluster type manually

* lint

* choose individual woring directory

* make sure we build a uniq file name

* make sure we build a uniq file name

* another place to choose a better TLD

* another place to choose a better TLD

* split folders
diff --git a/js/client/modules/@arangodb/testsuites/server_permissions.js b/js/client/modules/@arangodb/testsuites/server_permissions.js
@@ -297,8 +297,8 @@ function server_parameters(options) {
 }
 
 function server_secrets(options) {
-  let secretsDir = fs.join(fs.getTempPath(), 'arango_jwt_secrets');
-  fs.makeDirectory(secretsDir);
+  let secretsDir = fs.join(fs.getTempPath(), options.suffix, 'arango_jwt_secrets');
+  fs.makeDirectoryRecursive(secretsDir);
   let secretFiles = [
     fs.join(secretsDir, 'secret1'),
     fs.join(secretsDir, 'secret2')
@@ -309,9 +309,9 @@ function server_secrets(options) {
   process.env["jwt-secret-folder"] = secretsDir;
 
   // Now set up TLS with the first server key:
-  let keyfileDir = fs.join(fs.getTempPath(), 'arango_tls_keyfile');
+  let keyfileDir = fs.join(fs.getTempPath(), options.suffix, 'arango_tls_keyfile');
   let keyfileName = fs.join(keyfileDir, "server.pem");
-  fs.makeDirectory(keyfileDir);
+  fs.makeDirectoryRecursive(keyfileDir);
 
   fs.copyFile(fs.join("etc", "testing", "server.pem"), keyfileName);
 
diff --git a/tests/test-definitions.yml b/tests/test-definitions.yml
@@ -258,7 +258,6 @@
 - rta_makedata:
     options:
       type: mixed
-      size: large
     suites:
       - rta_makedata:
           args:
@@ -297,19 +296,30 @@
     options:
       coverage: false
       priority: 1000
-      type: cluster
+      type: mixed
     suites:
       - deadlock:
           args:
             dumpAgencyOnError: true
+            cluster: true
       - arangobench:
           args:
             dumpAgencyOnError: true
+            cluster: true
       - server_secrets:
           args:
+            suffix: cluster
             dumpAgencyOnError: true
-      - audit_client
-      - audit_server
+            cluster: true
+      - audit_client:
+          args:
+            cluster: true
+      - audit_server:
+          args:
+            cluster: true
+      - server_secrets:
+          args:
+            suffix: single
 
 - restart:
     options:
@@ -530,12 +540,6 @@
       buckets: 2
     args:
       dumpAgencyOnError: true
-- server_secrets:
-    options:
-      type: single
-      priority: 1000
-      parallelity: 5
-      size: small
 
 # Dump Tests
 - dump_single:
