Skip to content
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

Jump to bottom

fix: Updates to RStudio Integration tests #818

Merged
merged 7 commits into from
Nov 19, 2021
Merged

fix: Updates to RStudio Integration tests #818

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6165917
chore: Remove extraneous comments from launch-rstudio-workspace.test.js
Nov 19, 2021
b41973a
fix: Don't run rstudio tests if rstudio config is 'N/A'
Nov 19, 2021
396aa7e
Move advanced tests into common folder so they get executed
Nov 19, 2021
05477c4
Fix import path
Nov 19, 2021
db3a0de
Merge branch 'develop' into remove-rstudio-int-test-extraneous-comments
SanketD92 Nov 19, 2021
e7cf88c
Merge branch 'develop' into remove-rstudio-int-test-extraneous-comments
SanketD92 Nov 19, 2021
7078b6d
Merge branch 'develop' into remove-rstudio-int-test-extraneous-comments
SanketD92 Nov 19, 2021
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
10 changes: 6 additions & 4 deletions .../rstudio/launch-rstudio-workspace.test.js → .../rstudio/launch-rstudio-workspace.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

const { sleep } = require('@aws-ee/base-services/lib/helpers/utils');
const axios = require('axios').default;
const { runSetup } = require('../../../support/setup');
const { deleteWorkspaceServiceCatalog } = require('../../../support/complex/delete-workspace-service-catalog');
const { runSetup } = require('../../../../../support/setup');
const { deleteWorkspaceServiceCatalog } = require('../../../../../support/complex/delete-workspace-service-catalog');

describe('Launch and terminate RStudio instance', () => {
let setup;
Expand All @@ -28,7 +28,7 @@ describe('Launch and terminate RStudio instance', () => {
});

afterAll(async () => {
// await setup.cleanup();
await setup.cleanup();
});

async function checkAllRstudioWorkspaceIsTerminated() {
Expand All @@ -46,12 +46,14 @@ describe('Launch and terminate RStudio instance', () => {

// eslint-disable-next-line jest/expect-expect
it('should launch a RStudio instance', async () => {
if (setup.defaults.envTypes.rstudio.envTypeId === 'N/A') {
return;
}
// Putting checkAllRstudioWorkspaceIsTerminated check here, because putting this check in `beforeAll` will not stop executing the test if the check does fail
// https://github.com/facebook/jest/issues/2713
await checkAllRstudioWorkspaceIsTerminated();

const envId = await launchRStudioWorkspace();
// const envId = 'f7cb0f78-3fd2-4351-bea0-b6a05096c2c5';

// For installations without AppStream enabled, check that workspace CIDR can be changed
if (!setup.defaults.isAppStreamEnabled) {
Expand Down
4 changes: 2 additions & 2 deletions ...ns/verify-linux-study-permissions.test.js → ...ns/verify-linux-study-permissions.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
*/
const { sleep } = require('@aws-ee/base-services/lib/helpers/utils');
const { NodeSSH } = require('node-ssh');
const { mountStudies, readWrite } = require('../../../support/complex/run-shell-command');
const { runSetup } = require('../../../support/setup');
const { mountStudies, readWrite } = require('../../../../../support/complex/run-shell-command');
const { runSetup } = require('../../../../../support/setup');

describe('EC2 Linux scenarios', () => {
let setup;
Expand Down