From 825bb1ae77e84a31203af419fc97ec6823a55e22 Mon Sep 17 00:00:00 2001
From: Frostebite <jas.f.ukcmti@gmail.com>
Date: Sun, 12 Feb 2023 04:22:01 +0000
Subject: [PATCH] fix

---
 .../tests/shared-workspace-locking.test.ts     | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/model/cloud-runner/tests/shared-workspace-locking.test.ts b/src/model/cloud-runner/tests/shared-workspace-locking.test.ts
index ddeef542..f5e057b0 100644
--- a/src/model/cloud-runner/tests/shared-workspace-locking.test.ts
+++ b/src/model/cloud-runner/tests/shared-workspace-locking.test.ts
@@ -41,14 +41,24 @@ describe('Cloud Runner Locking', () => {
         (await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)) === false;
       expect(isExpectedUnlockedBeforeLocking).toBeTruthy();
       await SharedWorkspaceLocking.LockWorkspace(newWorkspaceName, runId, buildParameters);
-      CloudRunnerLogger.log((await SharedWorkspaceLocking.GetAllLocks(newWorkspaceName, buildParameters)).join(`,`));
-      CloudRunnerLogger.log(
+      const allLocks = await SharedWorkspaceLocking.GetAllLocks(newWorkspaceName, buildParameters);
+      expect(allLocks.filter((x) => x.includes(`${newWorkspaceName}_lock`))).toBeGreaterThan(0);
+      expect(
         (
           await SharedWorkspaceLocking.ReadLines(
             `aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParameters.cacheKey}/`,
           )
-        ).join(`,`),
-      );
+        ).filter((x) => x.includes(`${newWorkspaceName}_lock`)),
+      ).toBeGreaterThan(0);
+      expect(
+        (
+          await SharedWorkspaceLocking.ReadLines(
+            `aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}${buildParameters.cacheKey}/`,
+          )
+        ).filter((x) => x.includes(`${newWorkspaceName}_workspace`)),
+      ).toBeGreaterThan(0);
+      expect(await SharedWorkspaceLocking.DoesCacheKeyTopLevelExist(buildParameters)).toBeTruthy();
+      expect(await SharedWorkspaceLocking.DoesWorkspaceExist(newWorkspaceName, buildParameters)).toBeTruthy();
       const isExpectedLockedAfterLocking =
         (await SharedWorkspaceLocking.IsWorkspaceLocked(newWorkspaceName, buildParameters)) === true;
       expect(isExpectedLockedAfterLocking).toBeTruthy();