Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/callbacks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ import {
removeCoverageDataForEnviro,
tempScriptCache,
} from "./vcastTestInterface";
import {
closeConnection,
globalEnviroDataServerActive,
} from "../src-common/vcastServer";
import { updateDisplayedCoverage } from "./coverage";
import { updateExploreDecorations } from "./fileDecorator";
import { updateTestDecorator } from "./editorDecorator";
Expand Down Expand Up @@ -152,7 +148,6 @@ export async function loadScriptCallBack(

const enviroPath = path.join(path.dirname(scriptPath), enviroName);
await updateTestPane(enviroPath);
if (globalEnviroDataServerActive) await closeConnection(enviroPath);

// If it's a temporary tst file (from create new test script), we delete it.
// Otherwise it's a manually editing of an already existing tst file
Expand Down
11 changes: 0 additions & 11 deletions src/manage/manageSrc/manageCommands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ import {
envIsEmbeddedInProject,
} from "../../vcastUtilities";

import {
closeConnection,
globalEnviroDataServerActive,
} from "../../../src-common/vcastServer";

import {
globalProjectDataCache,
refreshAllExtensionData,
Expand Down Expand Up @@ -155,9 +150,6 @@ export async function cleanProjectEnvironment(
"--force",
];

// if we are in server mode, close any existing connection to the environment
if (globalEnviroDataServerActive) await closeConnection(enviroPath);

await executeWithRealTimeEchoWithProgress(
manageCommandToUse,
manageArgs,
Expand Down Expand Up @@ -223,9 +215,6 @@ export async function removeTestsuiteFromProject(
let progressMessage: string = "";
let projectLocation: string = "";

// if we are in server mode, close any existing connection to the environment
if (globalEnviroDataServerActive) await closeConnection(enviroPath);

for (const [projectPath, projectData] of globalProjectDataCache) {
for (const [cachedEnviroPath, enviroData] of projectData) {
// We search for the correct environment in the cache in order to get the project
Expand Down
10 changes: 0 additions & 10 deletions src/testPane.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,6 @@ import {
getEnviroNameFromScript,
getVcastOptionValues,
} from "../src-common/commonUtilities";
import {
closeConnection,
globalEnviroDataServerActive,
} from "../src-common/vcastServer";
import {
addManagedEnvironments,
ignoreEnvsInProject,
Expand Down Expand Up @@ -1570,9 +1566,6 @@ export async function runTests(

for (let enviroPath of enviroPathList) {
await updateDataForEnvironment(enviroPath);
if (globalEnviroDataServerActive) {
await closeConnection(enviroPath);
}
}
await updateDisplayedCoverage();
}
Expand Down Expand Up @@ -1649,7 +1642,6 @@ export async function deleteTests(nodeList: any[]) {
const enviroPath = getEnviroPathFromID(enviroNodeID);
await updateDataForEnvironment(enviroPath);
await updateProjectData(enviroPath);
if (globalEnviroDataServerActive) await closeConnection(enviroPath);
}
}

Expand Down Expand Up @@ -1697,7 +1689,6 @@ export async function loadTestScript() {
// update the test pane for this environment after the script is loaded
// we are reading the data back from the environment with this call
updateTestPane(enviroPath);
if (globalEnviroDataServerActive) await closeConnection(enviroPath);

// If it's a temporary tst file (from create new test script), we delete it.
// Otherwise it's a manually editing of an already existing tst file
Expand Down Expand Up @@ -2067,7 +2058,6 @@ export async function updateCodedTestCases(editor: any) {
} else {
vectorMessage("Error refreshing coded tests\n");
}
if (globalEnviroDataServerActive) await closeConnection(enviroPath);
}
// update the test names and checksum in all cases, rather than checking for diffs again
codedTestFileData.testNames = newTestNames;
Expand Down
18 changes: 0 additions & 18 deletions src/vcastAdapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { updateProjectData } from "./manage/manageSrc/manageCommands";
import { openMessagePane, vectorMessage } from "./messagePane";

import {
environmentDataCache,
getClicastArgsFromTestNode,
getClicastArgsFromTestNodeAsList,
getEnviroNameFromID,
Expand Down Expand Up @@ -504,9 +503,6 @@ export async function openVcastFromEnviroNode(
const enviroPath = getEnviroPathFromID(enviroNodeID);
const enclosingDirectory = path.dirname(enviroPath);

// close any existing clicast connection to this environment
if (globalEnviroDataServerActive) await closeConnection(enviroPath);

// we use spawn directly to control the detached and shell args
let vcast = spawn(vcastCommandToUse, vcastArgs, {
cwd: enclosingDirectory,
Expand All @@ -526,16 +522,6 @@ export async function openProjectInVcast(
// this returns the environment directory name without any nesting
let vcastArgs: string[] = ["-e " + projectName];

const projectPath = path.join(projectRoot, projectName);
// close any existing clicast connection to this environment
if (globalEnviroDataServerActive) {
for (let envData of environmentDataCache.values()) {
if (envData.projectPath === projectPath) {
await closeConnection(envData.buildDirectory);
}
}
}

// we use spawn directly to control the detached and shell args
let vcast = spawn(vcastCommandToUse, vcastArgs, {
cwd: projectRoot,
Expand All @@ -561,10 +547,6 @@ export async function openVcastFromVCEfile(vcePath: string, callback: any) {
const enclosingDirectory = path.dirname(vcePath);

vectorMessage("Opening vcast for: " + enviroPath);

// close any existing clicast connection to this environment
if (globalEnviroDataServerActive) await closeConnection(enviroPath);

vectorMessage(
`Calling vcast with args: ${vcastCommandToUse} ${vcastArgs.join(" ")}`
);
Expand Down
5 changes: 0 additions & 5 deletions src/vcastTestInterface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ import {
openTestFileAndErrors,
testStatus,
} from "./vcastUtilities";
import {
closeConnection,
globalEnviroDataServerActive,
} from "../src-common/vcastServer";

const fs = require("fs");
const path = require("path");
Expand Down Expand Up @@ -1080,7 +1076,6 @@ async function commonCodedTestProcessing(
} else {
openTestFileAndErrors(testNode);
}
if (globalEnviroDataServerActive) await closeConnection(enviroPath);
}

export async function addExistingCodedTestFile(testID: string) {
Expand Down
Loading