From 18a20d7eef123f72430ba8900dd209b34daac1bd Mon Sep 17 00:00:00 2001 From: Chris Mead Date: Tue, 21 Jan 2025 14:16:49 -0700 Subject: [PATCH 1/3] E2E test: fixes for web tests --- .github/workflows/test-e2e-linux.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test-e2e-linux.yml b/.github/workflows/test-e2e-linux.yml index 76eb0474d21..78490cf372b 100644 --- a/.github/workflows/test-e2e-linux.yml +++ b/.github/workflows/test-e2e-linux.yml @@ -130,6 +130,9 @@ jobs: - name: Alter AppArmor Restrictions for Playwright (Electron) run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + - name: Run Playwright Tests (Electron) env: POSITRON_PY_VER_SEL: 3.12.3 From 85faf88c8b1728995d4770c3033de141a4586dd4 Mon Sep 17 00:00:00 2001 From: Jonathan McPherson Date: Tue, 21 Jan 2025 15:36:41 -0800 Subject: [PATCH 2/3] only send a heartbeat in Workbench sessions --- src/vs/server/node/pwbHeartbeat.ts | 6 +++++- .../server/node/remoteExtensionHostAgentServer.ts | 13 ++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/vs/server/node/pwbHeartbeat.ts b/src/vs/server/node/pwbHeartbeat.ts index f30b0be0dee..82015b042b2 100644 --- a/src/vs/server/node/pwbHeartbeat.ts +++ b/src/vs/server/node/pwbHeartbeat.ts @@ -1,6 +1,10 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (C) 2023-2025 Posit Software, PBC. All rights reserved. + * Licensed under the Elastic License 2.0. See LICENSE.txt for license information. + *--------------------------------------------------------------------------------------------*/ import { createDecorator } from '../../../vs/platform/instantiation/common/instantiation.js'; import { registerSingleton } from '../../../vs/platform/instantiation/common/extensions.js'; -import { SyncDescriptor } from '../../../vs/platform/instantiation/common/descriptors'; +import { SyncDescriptor } from '../../../vs/platform/instantiation/common/descriptors.js'; import * as constants from './pwbConstants.js'; export const IPwbHeartbeatService = createDecorator('pwbHeartbeatService'); diff --git a/src/vs/server/node/remoteExtensionHostAgentServer.ts b/src/vs/server/node/remoteExtensionHostAgentServer.ts index d40f49fbd28..553995c2471 100644 --- a/src/vs/server/node/remoteExtensionHostAgentServer.ts +++ b/src/vs/server/node/remoteExtensionHostAgentServer.ts @@ -50,7 +50,7 @@ import { MandatoryServerConnectionToken } from './serverConnectionToken.js'; // --- End Positron --- // --- Start PWB: Server proxy support --- -import { kProxyRegex } from './pwbConstants.js'; +import { kProxyRegex, kSessionUrl } from './pwbConstants.js'; import { IPwbHeartbeatService } from './pwbHeartbeat.js'; // --- End PWB --- @@ -852,11 +852,14 @@ export async function createServer(address: string | net.AddressInfo | null, arg // -- End PWB: SSL support // -- Start PWB: Heartbeat - instantiationService.invokeFunction(async (accessor) => { - const pwbHeartbeatService = accessor.get(IPwbHeartbeatService); + // Inside a Posit Workbench session, send an initial heartbeat. + if (kSessionUrl) { + instantiationService.invokeFunction(async (accessor) => { + const pwbHeartbeatService = accessor.get(IPwbHeartbeatService); - pwbHeartbeatService.sendInitialHeartbeat(); - }); + pwbHeartbeatService.sendInitialHeartbeat(); + }); + } // -- End PWB: Heartbeat } From 31904cd50d8925dcb5ad9082c44f528628f4aa56 Mon Sep 17 00:00:00 2001 From: Christopher Mead Date: Wed, 22 Jan 2025 07:42:11 -0700 Subject: [PATCH 3/3] Remove tmate Signed-off-by: Christopher Mead --- .github/workflows/test-e2e-linux.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/test-e2e-linux.yml b/.github/workflows/test-e2e-linux.yml index 78490cf372b..76eb0474d21 100644 --- a/.github/workflows/test-e2e-linux.yml +++ b/.github/workflows/test-e2e-linux.yml @@ -130,9 +130,6 @@ jobs: - name: Alter AppArmor Restrictions for Playwright (Electron) run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - - name: Run Playwright Tests (Electron) env: POSITRON_PY_VER_SEL: 3.12.3