Skip to content

Commit 87d1854

Browse files
authored
Clean up of test env. before ui-test (#313)
* Clean up of test env. before ui-test Signed-off-by: Ondrej Dockal <odockal@redhat.com>
1 parent ab158d5 commit 87d1854

File tree

3 files changed

+37
-1
lines changed

3 files changed

+37
-1
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: failure()
3939
with:
4040
name: screenshots-${{ matrix.os }}
41-
path: ~/**/screenshots/*.png
41+
path: 'test-resources/**/screenshots/*.png'
4242
retention-days: 2
4343
if-no-files-found: warn
4444
- uses: codecov/codecov-action@v1

Jenkinsfile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,22 @@ node('rhel8'){
2626
}
2727
}
2828

29+
stage('UI Tests') {
30+
wrap([$class: 'Xvnc']) {
31+
try {
32+
sh """
33+
if [ -f \$HOME/.vs-kn/kn ]; then
34+
rm \$HOME/.vs-kn/kn
35+
fi
36+
"""
37+
sh "npm run base-ui-test"
38+
}
39+
finally {
40+
archiveArtifacts artifacts: 'test-resources/*.log,test-resources/**/*.png'
41+
}
42+
}
43+
}
44+
2945
stage('Package') {
3046
def packageJson = readJSON file: 'package.json'
3147
packageJson.extensionDependencies = ["ms-kubernetes-tools.vscode-kubernetes-tools"]

test/ui-test/extensionUITest.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
33
/* eslint-disable @typescript-eslint/no-unsafe-call */
44
/* eslint-disable @typescript-eslint/await-thenable */
5+
import fs = require('fs');
6+
import os = require('os');
7+
import path = require('path');
58
import { expect } from 'chai';
69
import {
710
ActivityBar,
@@ -37,12 +40,29 @@ function execShellCommand(cmd) {
3740
export function extensionsUITest(clusterIsAvailable: boolean): void {
3841
let driver: WebDriver;
3942
let kubectlExists: boolean;
43+
const homeDir = os.homedir();
44+
const vskn = path.join(homeDir, '.vs-kn');
45+
const vsfunc = path.join(homeDir, '.vs-func');
46+
const vskubectl = path.join(homeDir, '.vs-kubectl');
4047

4148
before(async () => {
4249
driver = VSBrowser.instance.driver;
4350
// check existence of kubectl on the path or in the home folder
4451
const kubectl = await execShellCommand('kubectl version --output json');
4552
kubectlExists = !(kubectl as string).includes('kubectl: command not found');
53+
if (fs.existsSync(vsfunc)) {
54+
console.log(`.vs-func does exist - removing`);
55+
fs.rmSync(vsfunc, { recursive: true, force: true });
56+
}
57+
if (fs.existsSync(vskn)) {
58+
console.log(`.vs-kn does exist - removing`);
59+
fs.rmSync(vskn, { recursive: true, force: true });
60+
}
61+
if (fs.existsSync(vskubectl)) {
62+
console.log(`.vs-kubectl does exist - removing`);
63+
fs.rmSync(vskubectl, { recursive: true, force: true });
64+
}
65+
console.log(`kubectl is on path: ${kubectlExists === true ? 'true' : 'false'}`);
4666
});
4767

4868
describe('Knative extension UI', () => {

0 commit comments

Comments
 (0)