Skip to content

Commit

Permalink
t
Browse files Browse the repository at this point in the history
  • Loading branch information
Cedric Halbronn committed May 21, 2024
1 parent 8026f8f commit eb05dcf
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
matrix:
# os: [macos-latest, ubuntu-latest, windows-latest]
os: [ubuntu-latest]
# app_version: [stable]
app_version: [v0.10.0]
app_version: [stable]
# app_version: [v0.10.0]
# include:
# - os: ubuntu-latest
# # app_version: v0.9.5
Expand Down
13 changes: 2 additions & 11 deletions packages/test-harness/src/launchNeovimAndRunTests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,9 @@ function delay(ms: number) {
* - Linux: /home/runner/work/cursorless/cursorless
* - OS X: /Users/runner/work/cursorless/cursorless
*/
export async function launchNeovimAndRunTests(/*extensionTestsPath: string*/) {
console.error(
"CED: launchNeovimAndRunTests() (error to simulate always logging even if logging level is set to error)",
);
export async function launchNeovimAndRunTests() {
let code = 1; // failure
try {
// The folder containing the Extension Manifest package.json
// Passed to `--extensionDevelopmentPath`
// const extensionDevelopmentPath = path.resolve(
// getCursorlessRepoRoot(),
// "packages/cursorless-vscode/dist",
// );

const crashDir = getEnvironmentVariableStrict("VSCODE_CRASH_DIR");
const logsDir = getEnvironmentVariableStrict("VSCODE_LOGS_DIR");
const useLegacyVscode =
Expand Down Expand Up @@ -260,6 +250,7 @@ export async function launchNeovimAndRunTests(/*extensionTestsPath: string*/) {
}
}

// XXX - code to replace above code, needs more testing
// code from packages\cursorless-vscode\src\scripts\initLaunchSandbox.ts
// await new Promise<void>((resolve, reject) => {
// subprocess.on("error", reject);
Expand Down
1 change: 0 additions & 1 deletion packages/test-harness/src/runAllTests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ export enum TestType {
}

export function runAllTests(...types: TestType[]) {
console.log("CED: runAllTests()");
return runTestsInDir(
path.join(getCursorlessRepoRoot(), "packages"),
(files) =>
Expand Down
10 changes: 1 addition & 9 deletions packages/test-harness/src/scripts/runNeovimTestsCI.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,10 @@
* This file can be run from node to run neovim tests in CI
*/

// import { getCursorlessRepoRoot } from "@cursorless/common";
// import * as path from "path";
import { launchNeovimAndRunTests } from "../launchNeovimAndRunTests";

(async () => {
// Note that we run all extension tests, including unit tests, in neovim, even though
// unit tests could be run separately.
// const extensionTestsPath = path.resolve(
// getCursorlessRepoRoot(),
// // "packages/test-harness/dist/extensionTestsNeovim.cjs",
// "packages/test-harness/out/index.cjs",
// );

await launchNeovimAndRunTests(/*extensionTestsPath*/);
await launchNeovimAndRunTests();
})();

0 comments on commit eb05dcf

Please sign in to comment.