increase test timeout

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
docker · Oct 17, 2024 · 7ec9dc8 · 7ec9dc8
1 parent a74c891
commit 7ec9dc8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/__tests__/docker/install.test.itg.ts b/__tests__/docker/install.test.itg.ts
@@ -70,5 +70,5 @@ aarch64:https://cloud.debian.org/images/cloud/bookworm/20231013-1532/debian-12-g
         await Docker.printInfo();
         await install.tearDown();
       })()).resolves.not.toThrow();
-    }, 1200000);
+    }, 10 * 60 * 1000);
 });
diff --git a/src/docker/assets.ts b/src/docker/assets.ts
@@ -232,7 +232,7 @@ provision:
         -O /etc/systemd/system/docker.socket || true
 
       mkdir -p /usr/local/bin
-      cp /tmp/lima/* /usr/local/bin/
+      cp {{toolDir}}/* /usr/local/bin/
       sed -i 's|^ExecStart=.*|ExecStart=/usr/local/bin/dockerd -H fd://|' /etc/systemd/system/docker.service
       sed -i 's|containerd.service||' /etc/systemd/system/docker.service
       if ! getent group docker; then

diff --git a/src/docker/install.ts b/src/docker/install.ts
@@ -34,6 +34,7 @@ import {Util} from '../util';
 import {limaYamlData, dockerServiceLogsPs1, setupDockerWinPs1} from './assets';
 import {GitHubRelease} from '../types/github';
 import {HubRepository} from '../hubRepository';
+import {randomUUID} from 'node:crypto';
 
 export interface InstallSourceImage {
   type: 'image';
@@ -202,7 +203,9 @@ export class Install {
 
     // this.toolDir is a very long path which causes trouble when mounting it in lima.
     // Copy it to a shorter path.
-    const limaToolsDir = '/tmp/lima';
+    // Random path
+    const limaToolsDir = '/tmp/lima/' + randomUUID();
+    await io.mkdirP(limaToolsDir);
 
     await core.group('Copy tools', async () => {
       await Exec.exec('cp', ['-rv', this.toolDir, limaToolsDir]);