Skip to content

Commit e4d759c

Browse files
eleanorjboydeleanorjboyd
committed
cleanup
1 parent 30037af commit e4d759c

File tree

7 files changed

+4
-53
lines changed

7 files changed

+4
-53
lines changed

‎python_files/unittestadapter/execution.py‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -253,16 +253,8 @@ def run_tests(
253253
return payload
254254

255255

256-
def execute_eot_and_cleanup():
257-
if __socket:
258-
__socket.close()
259-
260-
261256
__socket = None
262-
__atexit_registered = False
263-
if not __atexit_registered:
264-
atexit.register(execute_eot_and_cleanup)
265-
__atexit_registered = True
257+
atexit.register(lambda: __socket.close() if __socket else None)
266258

267259

268260
def send_run_data(raw_data, test_run_pipe):

‎python_files/unittestadapter/pvsc_utils.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@ def send_post_request(
334334
__writer = socket_manager.PipeManager(test_run_pipe)
335335
__writer.connect()
336336
except Exception as error:
337-
print("attempting to write", payload)
338337
error_msg = f"Error attempting to connect to extension named pipe {test_run_pipe}[vscode-unittest]: {error}"
339338
__writer = None
340339
raise VSCodeUnittestError(error_msg) from error

‎src/client/testing/testController/pytest/pytestDiscoveryAdapter.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ export class PytestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
4343
try {
4444
await this.runPytestDiscovery(uri, name, executionFactory);
4545
} finally {
46-
// await deferredTillEOT.promise;
47-
traceVerbose('deferredTill EOT resolved');
4846
dispose();
4947
}
5048
// this is only a placeholder to handle function overloading until rewrite is finished
@@ -141,7 +139,6 @@ export class PytestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
141139
);
142140
this.resultResolver?.resolveDiscovery(createDiscoveryErrorPayload(code, signal, cwd));
143141
}
144-
// deferredTillEOT is resolved when all data sent on stdout and stderr is received, close event is only called when this occurs
145142
// due to the sync reading of the output.
146143
deferredTillExecClose?.resolve();
147144
});

‎src/client/testing/testController/pytest/pytestExecutionAdapter.ts‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ export class PytestTestExecutionAdapter implements ITestExecutionAdapter {
3636
executionFactory?: IPythonExecutionFactory,
3737
debugLauncher?: ITestDebugLauncher,
3838
): Promise<ExecutionTestPayload> {
39-
// deferredTillEOT awaits EOT message and deferredTillServerClose awaits named pipe server close
40-
// const deferredTillEOT: Deferred<void> = utils.createTestingDeferred();
4139
const deferredTillServerClose: Deferred<void> = utils.createTestingDeferred();
4240

4341
// create callback to handle data received on the named pipe
@@ -54,9 +52,8 @@ export class PytestTestExecutionAdapter implements ITestExecutionAdapter {
5452
runInstance?.token, // token to cancel
5553
);
5654
runInstance?.token.onCancellationRequested(() => {
57-
traceInfo(`Test run cancelled, resolving 'till EOT' deferred for ${uri.fsPath}.`);
55+
traceInfo(`Test run cancelled, resolving 'TillServerClose' deferred for ${uri.fsPath}.`);
5856
// if canceled, stop listening for results
59-
// deferredTillEOT.resolve();
6057
serverDispose(); // this will resolve deferredTillServerClose
6158

6259
const executionPayload: ExecutionTestPayload = {
@@ -72,16 +69,13 @@ export class PytestTestExecutionAdapter implements ITestExecutionAdapter {
7269
uri,
7370
testIds,
7471
name,
75-
// deferredTillEOT,
7672
serverDispose,
7773
runInstance,
7874
profileKind,
7975
executionFactory,
8076
debugLauncher,
8177
);
8278
} finally {
83-
// wait for to send EOT
84-
// await deferredTillEOT.promise;
8579
await deferredTillServerClose.promise;
8680
}
8781

@@ -99,7 +93,6 @@ export class PytestTestExecutionAdapter implements ITestExecutionAdapter {
9993
uri: Uri,
10094
testIds: string[],
10195
resultNamedPipeName: string,
102-
// deferredTillEOT: Deferred<void>,
10396
serverDispose: () => void,
10497
runInstance?: TestRun,
10598
profileKind?: TestRunProfileKind,
@@ -172,7 +165,6 @@ export class PytestTestExecutionAdapter implements ITestExecutionAdapter {
172165
traceInfo(`Running DEBUG pytest with arguments: ${testArgs} for workspace ${uri.fsPath} \r\n`);
173166
await debugLauncher!.launchDebugger(launchOptions, () => {
174167
serverDispose(); // this will resolve deferredTillServerClose
175-
// deferredTillEOT?.resolve();
176168
});
177169
} else {
178170
// deferredTillExecClose is resolved when all stdout and stderr is read
@@ -232,14 +224,12 @@ export class PytestTestExecutionAdapter implements ITestExecutionAdapter {
232224
this.resultResolver?.resolveExecution(
233225
utils.createExecutionErrorPayload(code, signal, testIds, cwd),
234226
runInstance,
235-
// deferredTillEOT,
236227
);
237228
}
238229
// this doesn't work, it instead directs us to the noop one which is defined first
239230
// potentially this is due to the server already being close, if this is the case?
240231
serverDispose(); // this will resolve deferredTillServerClose
241232
}
242-
// deferredTillEOT is resolved when all data sent on stdout and stderr is received, close event is only called when this occurs
243233
// due to the sync reading of the output.
244234
deferredTillExecClose.resolve();
245235
});

‎src/client/testing/testController/unittest/testDiscoveryAdapter.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ export class UnittestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
4444
const { unittestArgs } = settings.testing;
4545
const cwd = settings.testing.cwd && settings.testing.cwd.length > 0 ? settings.testing.cwd : uri.fsPath;
4646

47-
// const deferredTillEOT: Deferred<void> = createDeferred<void>();
48-
4947
const { name, dispose } = await startDiscoveryNamedPipe((data: DiscoveredTestPayload) => {
5048
this.resultResolver?.resolveDiscovery(data);
5149
});
@@ -68,8 +66,6 @@ export class UnittestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
6866
try {
6967
await this.runDiscovery(uri, options, name, cwd, executionFactory);
7068
} finally {
71-
// await deferredTillEOT.promise;
72-
traceVerbose('deferredTill EOT resolved');
7369
dispose();
7470
}
7571
// placeholder until after the rewrite is adopted
@@ -83,7 +79,6 @@ export class UnittestTestDiscoveryAdapter implements ITestDiscoveryAdapter {
8379
options: TestCommandOptions,
8480
testRunPipeName: string,
8581
cwd: string,
86-
// deferredTillEOT: Deferred<void>,
8782
executionFactory?: IPythonExecutionFactory,
8883
): Promise<void> {
8984
// get and edit env vars

‎src/client/testing/testController/unittest/testExecutionAdapter.ts‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export class UnittestTestExecutionAdapter implements ITestExecutionAdapter {
4747
executionFactory?: IPythonExecutionFactory,
4848
debugLauncher?: ITestDebugLauncher,
4949
): Promise<ExecutionTestPayload> {
50-
// deferredTillEOT awaits EOT message and deferredTillServerClose awaits named pipe server close
50+
// deferredTillServerClose awaits named pipe server close
5151
const deferredTillServerClose: Deferred<void> = utils.createTestingDeferred();
5252

5353
// create callback to handle data received on the named pipe
@@ -64,10 +64,8 @@ export class UnittestTestExecutionAdapter implements ITestExecutionAdapter {
6464
runInstance?.token, // token to cancel
6565
);
6666
runInstance?.token.onCancellationRequested(() => {
67-
console.log(`Test run cancelled, resolving 'till EOT' deferred for ${uri.fsPath}.`);
67+
console.log(`Test run cancelled, resolving 'till TillAllServerClose' deferred for ${uri.fsPath}.`);
6868
// if canceled, stop listening for results
69-
// deferredTillEOT.resolve();
70-
// if canceled, close the server, resolves the deferredTillAllServerClose
7169
deferredTillServerClose.resolve();
7270
serverDispose();
7371
});
@@ -85,8 +83,6 @@ export class UnittestTestExecutionAdapter implements ITestExecutionAdapter {
8583
} catch (error) {
8684
traceError(`Error in running unittest tests: ${error}`);
8785
} finally {
88-
// wait for EOT
89-
// await deferredTillEOT.promise;
9086
await deferredTillServerClose.promise;
9187
}
9288
const executionPayload: ExecutionTestPayload = {
@@ -101,7 +97,6 @@ export class UnittestTestExecutionAdapter implements ITestExecutionAdapter {
10197
uri: Uri,
10298
testIds: string[],
10399
resultNamedPipeName: string,
104-
// deferredTillEOT: Deferred<void>,
105100
serverDispose: () => void,
106101
runInstance?: TestRun,
107102
profileKind?: TestRunProfileKind,
@@ -178,7 +173,6 @@ export class UnittestTestExecutionAdapter implements ITestExecutionAdapter {
178173
}
179174
await debugLauncher.launchDebugger(launchOptions, () => {
180175
serverDispose(); // this will resolve the deferredTillAllServerClose
181-
// deferredTillEOT?.resolve();
182176
});
183177
} else {
184178
// This means it is running the test

‎src/test/testing/testController/testCancellationRunAdapters.unit.test.ts‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,6 @@ suite('Execution Flow Run Adapters', () => {
110110
}
111111
});
112112

113-
// mock EOT token & ExecClose token
114-
const deferredExecClose = createDeferred();
115-
const utilsCreateEOTStub: sinon.SinonStub = sinon.stub(util, 'createTestingDeferred');
116-
utilsCreateEOTStub.callsFake(() => deferredExecClose);
117-
118113
// define adapter and run tests
119114
const testAdapter = createAdapter(adapter, configService, typeMoq.Mock.ofType<ITestOutputChannel>().object);
120115
await testAdapter.runTests(
@@ -185,17 +180,6 @@ suite('Execution Flow Run Adapters', () => {
185180
}
186181
});
187182

188-
// mock EOT token & ExecClose token
189-
const deferredEOT = createDeferred();
190-
const deferredExecClose = createDeferred();
191-
const utilsCreateEOTStub: sinon.SinonStub = sinon.stub(util, 'createTestingDeferred');
192-
utilsCreateEOTStub.callsFake(() => {
193-
if (utilsCreateEOTStub.callCount === 1) {
194-
return deferredEOT;
195-
}
196-
return deferredExecClose;
197-
});
198-
199183
// debugLauncher mocked
200184
debugLauncher
201185
.setup((dl) => dl.launchDebugger(typeMoq.It.isAny(), typeMoq.It.isAny()))

0 commit comments

Comments
 (0)