From 06c789f5f6b377957051b29ac384e127822f04e4 Mon Sep 17 00:00:00 2001 From: Naoyuki Sogo Date: Sat, 6 Jun 2026 10:33:46 +0900 Subject: [PATCH 01/13] fix UT --- server/app/core/sshManager.js | 5 +++-- server/test/app/core/projectOperator.js | 15 +++++++++------ server/test/app/core/sshManager.js | 12 ++---------- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/server/app/core/sshManager.js b/server/app/core/sshManager.js index 08d040567..5f90570d3 100644 --- a/server/app/core/sshManager.js +++ b/server/app/core/sshManager.js @@ -14,7 +14,8 @@ const _internal = { getSsh, hasEntry, askPassword, - emitAll + emitAll, + verboseSsh }; /** @@ -205,7 +206,7 @@ async function createSsh(projectRootDir, remoteHostName, hostinfo, clientID, isS if (hostinfo.readyTimeout) { hostinfo.ConnectTimeout = Math.floor(hostinfo.readyTimeout / 1000); } - if (verboseSsh) { + if (_internal.verboseSsh) { hostinfo.sshOpt = ["-vvv"]; } if (hostinfo.username) { diff --git a/server/test/app/core/projectOperator.js b/server/test/app/core/projectOperator.js index 903c71408..9793a545a 100644 --- a/server/test/app/core/projectOperator.js +++ b/server/test/app/core/projectOperator.js @@ -44,11 +44,6 @@ describe("UT for projectOperation callback function", function () { beforeEach(async ()=>{ await fs.remove(testDirRoot); await createNewProject(projectRootDir, "test project", null, "test", "test@example.com"); - const sbs = _internal.projectOperationQueues.get(projectRootDir); - if (sbs) { - sbs.clear(); - } - _internal.projectOperationQueues.clear(); sinon.stub(_internal, "onRunProject").value(onRunProject); sinon.stub(_internal, "onStopProject").value(onStopProject); sinon.stub(_internal, "onCleanProject").value(onCleanProject); @@ -64,7 +59,15 @@ describe("UT for projectOperation callback function", function () { onRevertProject.reset(); onSaveProject.reset(); }); - afterEach(()=>{ + afterEach(async ()=>{ + const sbs = _internal.projectOperationQueues.get(projectRootDir); + if (sbs) { + sbs.clear(); + while (sbs.running.size > 0) { + await sleep(10); + } + } + _internal.projectOperationQueues.clear(); sinon.restore(); }); after(async ()=>{ diff --git a/server/test/app/core/sshManager.js b/server/test/app/core/sshManager.js index eca5dac68..1329e027c 100644 --- a/server/test/app/core/sshManager.js +++ b/server/test/app/core/sshManager.js @@ -374,8 +374,6 @@ describe("#createSsh", ()=>{ let askPasswordStub; let SshClientWrapperStub; let canConnectStub; - let originalWheelVerboseSsh; - beforeEach(()=>{ hasEntryStub = sinon.stub(_internal, "hasEntry"); getSshStub = sinon.stub(_internal, "getSsh"); @@ -387,17 +385,11 @@ describe("#createSsh", ()=>{ canConnect: canConnectStub }; }); - originalWheelVerboseSsh = process.env.WHEEL_VERBOSE_SSH; - delete process.env.WHEEL_VERBOSE_SSH; + sinon.stub(_internal, "verboseSsh").value(false); }); afterEach(()=>{ sinon.restore(); - if (originalWheelVerboseSsh !== undefined) { - process.env.WHEEL_VERBOSE_SSH = originalWheelVerboseSsh; - } else { - delete process.env.WHEEL_VERBOSE_SSH; - } }); it("should return an existing ssh instance if hasEntry is true", async ()=>{ @@ -509,7 +501,7 @@ describe("#createSsh", ()=>{ }); it("should set sshOpt=['-vvv'] if WHEEL_VERBOSE_SSH is truthy", async ()=>{ - process.env.WHEEL_VERBOSE_SSH = "true"; + sinon.stub(_internal, "verboseSsh").value(true); hasEntryStub.returns(false); canConnectStub.resolves(true); From 2dd3611197fabe4e178527e4ec6f98470226da47 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 5 Jun 2026 05:31:04 +0000 Subject: [PATCH 02/13] Fix failing Cypress tests: button text mismatches, v-img eager loading, and overflow visibility --- client/src/components/common/applicationToolBar.vue | 1 + test/cypress/e2e/components/hpciss.cy.js | 2 +- test/cypress/e2e/components/hpcisstar.cy.js | 2 +- test/cypress/e2e/components/ps.cy.js | 6 +++--- test/cypress/e2e/components/stepjobTask.cy.js | 2 +- test/cypress/e2e/components/storage.cy.js | 2 +- test/cypress/e2e/components/task.cy.js | 3 ++- test/cypress/support/commands.js | 2 +- 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/client/src/components/common/applicationToolBar.vue b/client/src/components/common/applicationToolBar.vue index 139d55ee7..12ee41b98 100644 --- a/client/src/components/common/applicationToolBar.vue +++ b/client/src/components/common/applicationToolBar.vue @@ -17,6 +17,7 @@