Merge branch 'main' into performance/create-tests

Altinn · Nov 1, 2024 · fb08882 · fb08882
2 parents f4e5f0e + a1df0ff
commit fb08882
Showing 1 changed file with 26 additions and 13 deletions.
diff --git a/tests/k6/common/sentinel.js b/tests/k6/common/sentinel.js
@@ -8,23 +8,36 @@ export default function () {
         scopes: "digdir:dialogporten.serviceprovider digdir:dialogporten.serviceprovider.search digdir:dialogporten.serviceprovider.admin digdir:dialogporten.correspondence"
     }
     describe('Post run: checking for unpurged dialogs', () => {
-        let r = getSO('dialogs/?Search=' + sentinelValue, null, tokenOptions);
-        expectStatusFor(r).to.equal(200);
-        expect(r, 'response').to.have.validJsonBody();
-        var response = r.json();
-        if (response.items && response.items.length > 0) {
-            console.error("Found " + response.items.length + " unpurged dialogs, make sure that all tests clean up after themselves. Purging ...");
-            response.items.forEach((item) => {
-                console.warn("Sentinel purging dialog with id: " + item.id)
-                let r = purgeSO('dialogs/' + item.id, null, tokenOptions);
+        let hasNextPage = false;
+        let continuationToken = "";
+        let dialogIdsToPurge = [];
+        do {
+            let r = getSO('dialogs/?Search=' + sentinelValue + continuationToken, null, tokenOptions);
+            expectStatusFor(r).to.equal(200);
+            expect(r, 'response').to.have.validJsonBody();
+            let response = r.json();
+            if (response.items && response.items.length > 0) {
+                response.items.forEach((item) => {
+                    dialogIdsToPurge.push(item.id);
+                });
+                continuationToken = "&continuationToken=" + response.continuationToken;
+            }
+            hasNextPage = response.hasNextPage;
+        } while (hasNextPage);
+
+        if (dialogIdsToPurge.length > 0) {
+            console.error("Found " + dialogIdsToPurge.length + " unpurged dialogs, make sure that all tests clean up after themselves. Purging ...");
+            dialogIdsToPurge.forEach((id) => {
+                console.warn("Sentinel purging dialog with id: " + id)
+                let r = purgeSO('dialogs/' + id, null, tokenOptions);
                 if (r.status != 204) {
-                    console.error("Failed to purge dialog with id: " + item.id);
+                    console.error("Failed to purge dialog with id: " + id);
                     console.log(r);
                 }
             });
-
-            // Fail the test after purging for visibility
-            expect(response.items.length, 'unpurged dialogs').to.equal(0);
         }
+
+        // Fail the test after purging for visibility
+        expect(dialogIdsToPurge.length, 'unpurged dialogs').to.equal(0);
     });
 }