fix: just log warning if ubuntu version is not supported

gemini-testing · Dec 2, 2024 · 642e41f · 642e41f
1 parent 6f9aeaf
commit 642e41f
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/src/browser-installer/ubuntu-packages/apt.ts b/src/browser-installer/ubuntu-packages/apt.ts
@@ -115,6 +115,12 @@ const unpackUbuntuPackages = async (packagesDir: string, destination: string): P
 };
 
 export const installUbuntuPackages = async (packages: string[], destination: string): Promise<void> => {
+    if (!packages) {
+        browserInstallerDebug(`There are no ubuntu packages to install`);
+
+        return fs.ensureDir(destination);
+    }
+
     const withRecursiveDependencies = await resolveTransitiveDependencies(packages);
 
     browserInstallerDebug(`Resolved direct packages to ${withRecursiveDependencies.length} dependencies`);

diff --git a/src/browser-installer/ubuntu-packages/index.ts b/src/browser-installer/ubuntu-packages/index.ts
@@ -16,9 +16,14 @@ const readUbuntuPackageDependencies = async (ubuntuMilestone: string): Promise<s
     try {
         return await fs.readJSON(getDependenciesArrayFilePath(ubuntuMilestone));
     } catch (_) {
-        throw new Error(
-            `Unable to read ubuntu dependencies for Ubuntu@${ubuntuMilestone}, as this version currently not supported`,
+        logger.warn(
+            [
+                `Unable to read ubuntu dependencies for Ubuntu@${ubuntuMilestone}, as this version currently not supported`,
+                `Assuming all necessary packages are installed already`,
+            ].join("\n"),
         );
+
+        return [];
     }
 };
 

diff --git a/test/src/browser-installer/ubuntu-packages.ts b/test/src/browser-installer/ubuntu-packages.ts
@@ -15,6 +15,7 @@ describe("browser-installer/ubuntu-packages", () => {
 
     let fsStub: Record<keyof typeof import("fs-extra"), SinonStub>;
     let loggerLogStub: SinonStub;
+    let loggerWarnStub: SinonStub;
     let installUbuntuPackagesStub: SinonStub;
     let getUbuntuMilestoneStub: SinonStub;
 
@@ -28,14 +29,15 @@ describe("browser-installer/ubuntu-packages", () => {
         } as Record<keyof typeof import("fs-extra"), SinonStub>;
 
         loggerLogStub = sandbox.stub();
+        loggerWarnStub = sandbox.stub();
         installUbuntuPackagesStub = sandbox.stub();
         getUbuntuMilestoneStub = sandbox.stub().resolves("20");
 
         const ubuntuPackages = proxyquire("../../../src/browser-installer/ubuntu-packages", {
             "fs-extra": fsStub,
             "./apt": { installUbuntuPackages: installUbuntuPackagesStub },
             "./utils": { getUbuntuMilestone: getUbuntuMilestoneStub },
-            "../../utils/logger": { log: loggerLogStub },
+            "../../utils/logger": { log: loggerLogStub, warn: loggerWarnStub },
         });
 
         ({ writeUbuntuPackageDependencies, installUbuntuPackageDependencies, getUbuntuLinkerEnv } = ubuntuPackages);
@@ -97,6 +99,22 @@ describe("browser-installer/ubuntu-packages", () => {
             assert.notCalled(loggerLogStub);
             assert.notCalled(installUbuntuPackagesStub);
         });
+
+        it("should log warning if current ubuntu version is not supported", async () => {
+            getUbuntuMilestoneStub.resolves("100500");
+            fsStub.readJSON.withArgs(sinon.match("ubuntu-100500-dependencies.json")).rejects(new Error("No such file"));
+
+            await installUbuntuPackageDependencies();
+
+            assert.calledOnceWith(
+                loggerWarnStub,
+                [
+                    `Unable to read ubuntu dependencies for Ubuntu@100500, as this version currently not supported`,
+                    `Assuming all necessary packages are installed already`,
+                ].join("\n"),
+            );
+            assert.calledOnceWith(installUbuntuPackagesStub, []);
+        });
     });
 
     describe("getUbuntuLinkerEnv", () => {