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 running DevWorkspaceHappyPath test on PROW ci #20903

Merged
merged 1 commit into from
Dec 9, 2021
Merged

Fix running DevWorkspaceHappyPath test on PROW ci #20903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions tests/devworkspace-happy-path/resources/cluster-oauth-patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"spec": {
"identityProviders": [
{
"name": "che-htpasswd",
"mappingMethod": "claim",
"name": "dev-htpasswd",
"mappingMethod": "add",
"type": "HTPasswd",
"htpasswd": {
"fileData": {
"name": "che-htpasswd-secret"
"name": "dev-htpasswd-secret"
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions tests/devworkspace-happy-path/resources/pod-che-happy-path.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ spec:
- name: TS_SELENIUM_LOG_LEVEL
value: TRACE
- name: TS_SELENIUM_OCP_USERNAME
value: 'che-user'
value: 'happypath-dev'
- name: TS_SELENIUM_OCP_PASSWORD
value: "user"
value: "dev"
- name: TS_SELENIUM_VALUE_OPENSHIFT_OAUTH
value: 'true'
- name: TS_SELENIUM_USERNAME
value: "admin"
- name: TS_SELENIUM_PASSWORD
value: 'admin'
- name: TS_OCP_LOGIN_PAGE_PROVIDER_TITLE
value: "che-htpasswd"
value: "dev-htpasswd"
- name: DELETE_WORKSPACE_ON_FAILED_TEST
value: "true"
- name: TS_SELENIUM_START_WORKSPACE_TIMEOUT
Expand All @@ -57,7 +57,7 @@ spec:
limits:
memory: "4Gi"
cpu: "2"
# Download results
# Download results
- name: download-reports
image: eeacms/rsync
imagePullPolicy: IfNotPresent
Expand Down
3 changes: 1 addition & 2 deletions tests/devworkspace-happy-path/resources/users.htpasswd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
# login: che-user. password: user
che-user:{SHA}Et6pb+wgWTVmq3VpLJlJWWgzrck=
happypath-dev:$2y$05$W0AwRfPa1A1ne8QI0rvzpOgroeASayQdvNR.5GteVqjx26TOWz/km
6 changes: 3 additions & 3 deletions tests/e2e/tests/e2e_happy_path/DevWorkspaceHappyPath.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ suite('Workspace creation via factory url', async () => {
});

test('Run application', async () => {
const taskName: string = 'run';
const taskName: string = 'run-with-hsqldb';
await topMenu.runTask(`${taskName}, ${globalTaskScope}`);
await ide.waitNotification('Process 8080-tcp is now listening on port 8080. Open it ?', 120_000);
// devWs specific. After running test application we can open it just in the new window.
Expand All @@ -154,8 +154,8 @@ suite('Workspace creation via factory url', async () => {
});

test('Close the terminal running tasks', async () => {
await terminal.rejectTerminalProcess('run');
await terminal.closeTerminalTab('run');
await terminal.rejectTerminalProcess('run-with-hsqldb');
await terminal.closeTerminalTab('run-with-hsqldb');
await warningDialog.waitAndCloseIfAppear();
await terminal.closeTerminalTab('build');
});
Expand Down