Skip to content

Skip Python 2.7 when running functional Daemon tests #8547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 12, 2019
Merged

Skip Python 2.7 when running functional Daemon tests #8547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6021d64
Skip Python 2.7 in Daemon tests
DonJayamanne Nov 12, 2019
5daf0e2
Increase test timeout
DonJayamanne Nov 12, 2019
021031d
Creating a process is slow on windows
DonJayamanne Nov 12, 2019
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
8 changes: 6 additions & 2 deletions src/test/common/process/pythonDaemon.functional.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { createTemporaryFile } from '../../../client/common/utils/fs';
import { Architecture } from '../../../client/common/utils/platform';
import { parsePythonVersion } from '../../../client/common/utils/version';
import { EXTENSION_ROOT_DIR } from '../../../client/constants';
import { PYTHON_PATH } from '../../common';
import { isPythonVersion, PYTHON_PATH } from '../../common';
use(chaiPromised);

// tslint:disable-next-line: max-func-body-length
Expand All @@ -42,7 +42,11 @@ suite('Daemon', () => {
.trim();
}
});
setup(() => {
setup(async function () {
if (isPythonVersion('2.7')){
// tslint:disable-next-line: no-invalid-this
return this.skip();
}
// Enable the following to log everything going on at pyton end.
// pythonProc = spawn(fullyQualifiedPythonPath, ['-m', 'datascience.daemon', '-v', `--log-file=${path.join(EXTENSION_ROOT_DIR, 'test.log')}`], { env });
pythonProc = spawn(fullyQualifiedPythonPath, ['-m', 'datascience.daemon'], { env });
Expand Down
14 changes: 9 additions & 5 deletions src/test/common/process/pythonDaemonPool.functional.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { Architecture } from '../../../client/common/utils/platform';
import { parsePythonVersion } from '../../../client/common/utils/version';
import { EXTENSION_ROOT_DIR } from '../../../client/constants';
import { PythonDaemonModule } from '../../../client/datascience/constants';
import { PYTHON_PATH, waitForCondition } from '../../common';
import { isPythonVersion, PYTHON_PATH, waitForCondition } from '../../common';
use(chaiPromised);

// tslint:disable: max-func-body-length
Expand All @@ -53,7 +53,11 @@ suite('Daemon - Python Daemon Pool', () => {
.trim();
}
});
setup(async () => {
setup(async function () {
if (isPythonVersion('2.7')){
// tslint:disable-next-line: no-invalid-this
return this.skip();
}
createDaemonServicesSpy = sinon.spy(DaemonPool.prototype, 'createDaemonServices');
pythonExecutionService = mock(PythonExecutionService);
when(pythonExecutionService.execModuleObservable('datascience.daemon', anything(), anything())).thenCall(() => {
Expand Down Expand Up @@ -250,7 +254,7 @@ suite('Daemon - Python Daemon Pool', () => {
outputsReceived.filter(item => item.length > 0),
['0', '1', '2', '3', '4']
);
}).timeout(1_000);
}).timeout(5_000);

test('Execute a file and throw exception if stderr is not empty', async () => {
const fileToExecute = await createPythonFile(['import sys', 'sys.stderr.write("KABOOM")'].join(os.EOL));
Expand All @@ -274,7 +278,7 @@ suite('Daemon - Python Daemon Pool', () => {
output.out.subscribe(out => outputsReceived.push(out.out.trim()), reject, resolve);
});
await expect(promise).to.eventually.be.rejectedWith('KABOOM');
}).timeout(1_000);
}).timeout(5_000);
test('If executing a file takes time, then ensure we use another daemon', async () => {
const source = dedent`
import os
Expand Down Expand Up @@ -409,5 +413,5 @@ suite('Daemon - Python Daemon Pool', () => {
// Confirm we have a total of three process ids (for 3 daemons).
// 2 for earlier, then one died and a new one was created.
expect(processesUsedToRunCode.size).to.be.greaterThan(2);
}).timeout(5_000);
}).timeout(10_000);
});