Skip to content

Commit 4dc7385

Browse files
joaomorenojoaomoreno
committed
complete integration test results
1 parent f9911c7 commit 4dc7385

28 files changed

Lines changed: 929 additions & 143 deletions

File tree

‎build/tfs/continuous-build.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ phases:
2727
yarn download-builtin-extensions
2828
displayName: Download Built-in Extensions
2929
- powershell: |
30-
.\scripts\test.bat --tfs
30+
.\scripts\test.bat --tfs "Unit Tests"
3131
displayName: Run Unit Tests
3232
- powershell: |
33-
.\scripts\test-integration.bat
33+
.\scripts\test-integration.bat --tfs "Integration Tests"
3434
displayName: Run Integration Tests
3535
- powershell: |
3636
yarn smoketest --screenshots "$(Build.ArtifactStagingDirectory)\artifacts" --log "$(Build.ArtifactStagingDirectory)\artifacts\smoketest.log"
@@ -88,7 +88,7 @@ phases:
8888
yarn download-builtin-extensions
8989
displayName: Download Built-in Extensions
9090
- script: |
91-
DISPLAY=:10 ./scripts/test.sh --tfs
91+
DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
9292
displayName: Run Unit Tests
9393
- task: PublishTestResults@2
9494
displayName: Publish Tests Results
@@ -125,10 +125,10 @@ phases:
125125
yarn download-builtin-extensions
126126
displayName: Download Built-in Extensions
127127
- script: |
128-
./scripts/test.sh --tfs
128+
./scripts/test.sh --tfs "Unit Tests"
129129
displayName: Run Unit Tests
130130
- script: |
131-
./scripts/test-integration.sh
131+
./scripts/test-integration.sh --tfs "Integration Tests"
132132
displayName: Run Integration Tests
133133
- script: |
134134
yarn smoketest --screenshots "$(Build.ArtifactStagingDirectory)/artifacts" --log "$(Build.ArtifactStagingDirectory)/artifacts/smoketest.log"

‎build/tfs/product-build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ phases:
4242
- powershell: |
4343
$ErrorActionPreference = "Stop"
4444
npm run gulp -- "electron-$(VSCODE_ARCH)"
45-
.\scripts\test.bat --build --tfs
45+
.\scripts\test.bat --build --tfs "Unit Tests"
4646
# yarn smoketest -- --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
4747
name: test
4848
@@ -271,7 +271,7 @@ phases:
271271
- script: |
272272
set -e
273273
npm run gulp -- "electron-$(VSCODE_ARCH)"
274-
DISPLAY=:10 ./scripts/test.sh --build --tfs
274+
DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
275275
# yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
276276
name: test
277277
@@ -327,7 +327,7 @@ phases:
327327
- script: |
328328
set -e
329329
npm run gulp -- "electron-$(VSCODE_ARCH)"
330-
DISPLAY=:10 ./scripts/test.sh --build --tfs
330+
DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
331331
# yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
332332
name: test
333333
@@ -376,7 +376,7 @@ phases:
376376
377377
- script: |
378378
set -e
379-
./scripts/test.sh --build --tfs
379+
./scripts/test.sh --build --tfs "Unit Tests"
380380
APP_NAME="`ls $(agent.builddirectory)/VSCode-darwin | head -n 1`"
381381
# yarn smoketest -- --build "$(agent.builddirectory)/VSCode-darwin/$APP_NAME"
382382
name: test

‎extensions/css-language-features/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,7 @@
701701
"vscode-nls": "^3.2.2"
702702
},
703703
"devDependencies": {
704-
"@types/node": "7.0.43"
704+
"@types/node": "7.0.43",
705+
"mocha": "^5.2.0"
705706
}
706707
}

‎extensions/css-language-features/server/package.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
},
1515
"devDependencies": {
1616
"@types/mocha": "2.2.33",
17-
"@types/node": "7.0.43"
17+
"@types/node": "7.0.43",
18+
"glob": "^7.1.2",
19+
"mocha": "^5.2.0",
20+
"mocha-junit-reporter": "^1.17.0",
21+
"mocha-multi-reporters": "^1.1.7"
1822
},
1923
"scripts": {
2024
"compile": "gulp compile-extension:css-language-features-server",

‎extensions/css-language-features/server/test/index.js‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
const path = require('path');
7+
const Mocha = require('mocha');
8+
const glob = require('glob');
9+
10+
const suite = 'Integration CSS Extension Tests';
11+
12+
const options = {
13+
ui: 'tdd', // the TDD UI is being used in extension.test.ts (suite, test, etc.)
14+
useColors: true, // colored output from test results (only windows cannot handle)
15+
timeout: 60000
16+
};
17+
18+
if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
19+
options.reporter = 'mocha-multi-reporters';
20+
options.reporterOptions = {
21+
reporterEnabled: 'spec, mocha-junit-reporter',
22+
mochaJunitReporterReporterOptions: {
23+
testsuitesTitle: `${suite} ${process.platform}`,
24+
mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
25+
}
26+
};
27+
}
28+
29+
const mocha = new Mocha(options);
30+
31+
glob.sync(__dirname + '/../out/test/**/*.test.js')
32+
.forEach(file => mocha.addFile(file));
33+
34+
mocha.run(failures => process.exit(failures ? -1 : 0));

‎extensions/css-language-features/server/test/mocha.opts‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎extensions/css-language-features/server/yarn.lock‎

Lines changed: 192 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,190 @@
1010
version "7.0.43"
1111
resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
1212

13+
ansi-regex@^3.0.0:
14+
version "3.0.0"
15+
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
16+
17+
balanced-match@^1.0.0:
18+
version "1.0.0"
19+
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
20+
21+
brace-expansion@^1.1.7:
22+
version "1.1.11"
23+
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
24+
dependencies:
25+
balanced-match "^1.0.0"
26+
concat-map "0.0.1"
27+
28+
browser-stdout@1.3.1:
29+
version "1.3.1"
30+
resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
31+
32+
charenc@~0.0.1:
33+
version "0.0.2"
34+
resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
35+
36+
commander@2.15.1:
37+
version "2.15.1"
38+
resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
39+
40+
concat-map@0.0.1:
41+
version "0.0.1"
42+
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
43+
44+
crypt@~0.0.1:
45+
version "0.0.2"
46+
resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
47+
48+
debug@3.1.0, debug@^3.1.0:
49+
version "3.1.0"
50+
resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
51+
dependencies:
52+
ms "2.0.0"
53+
54+
debug@^2.2.0:
55+
version "2.6.9"
56+
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
57+
dependencies:
58+
ms "2.0.0"
59+
60+
diff@3.5.0:
61+
version "3.5.0"
62+
resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
63+
64+
escape-string-regexp@1.0.5:
65+
version "1.0.5"
66+
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
67+
68+
fs.realpath@^1.0.0:
69+
version "1.0.0"
70+
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
71+
72+
glob@7.1.2, glob@^7.1.2:
73+
version "7.1.2"
74+
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
75+
dependencies:
76+
fs.realpath "^1.0.0"
77+
inflight "^1.0.4"
78+
inherits "2"
79+
minimatch "^3.0.4"
80+
once "^1.3.0"
81+
path-is-absolute "^1.0.0"
82+
83+
growl@1.10.5:
84+
version "1.10.5"
85+
resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
86+
87+
has-flag@^3.0.0:
88+
version "3.0.0"
89+
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
90+
91+
he@1.1.1:
92+
version "1.1.1"
93+
resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
94+
95+
inflight@^1.0.4:
96+
version "1.0.6"
97+
resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
98+
dependencies:
99+
once "^1.3.0"
100+
wrappy "1"
101+
102+
inherits@2:
103+
version "2.0.3"
104+
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
105+
106+
is-buffer@~1.1.1:
107+
version "1.1.6"
108+
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
109+
110+
lodash@^4.16.4:
111+
version "4.17.10"
112+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
113+
114+
md5@^2.1.0:
115+
version "2.2.1"
116+
resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
117+
dependencies:
118+
charenc "~0.0.1"
119+
crypt "~0.0.1"
120+
is-buffer "~1.1.1"
121+
122+
minimatch@3.0.4, minimatch@^3.0.4:
123+
version "3.0.4"
124+
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
125+
dependencies:
126+
brace-expansion "^1.1.7"
127+
128+
minimist@0.0.8:
129+
version "0.0.8"
130+
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
131+
132+
mkdirp@0.5.1, mkdirp@~0.5.1:
133+
version "0.5.1"
134+
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
135+
dependencies:
136+
minimist "0.0.8"
137+
138+
mocha-junit-reporter@^1.17.0:
139+
version "1.17.0"
140+
resolved "https://registry.yarnpkg.com/mocha-junit-reporter/-/mocha-junit-reporter-1.17.0.tgz#2e5149ed40fc5d2e3ca71e42db5ab1fec9c6d85c"
141+
dependencies:
142+
debug "^2.2.0"
143+
md5 "^2.1.0"
144+
mkdirp "~0.5.1"
145+
strip-ansi "^4.0.0"
146+
xml "^1.0.0"
147+
148+
mocha-multi-reporters@^1.1.7:
149+
version "1.1.7"
150+
resolved "https://registry.yarnpkg.com/mocha-multi-reporters/-/mocha-multi-reporters-1.1.7.tgz#cc7f3f4d32f478520941d852abb64d9988587d82"
151+
dependencies:
152+
debug "^3.1.0"
153+
lodash "^4.16.4"
154+
155+
mocha@^5.2.0:
156+
version "5.2.0"
157+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.2.0.tgz#6d8ae508f59167f940f2b5b3c4a612ae50c90ae6"
158+
dependencies:
159+
browser-stdout "1.3.1"
160+
commander "2.15.1"
161+
debug "3.1.0"
162+
diff "3.5.0"
163+
escape-string-regexp "1.0.5"
164+
glob "7.1.2"
165+
growl "1.10.5"
166+
he "1.1.1"
167+
minimatch "3.0.4"
168+
mkdirp "0.5.1"
169+
supports-color "5.4.0"
170+
171+
ms@2.0.0:
172+
version "2.0.0"
173+
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
174+
175+
once@^1.3.0:
176+
version "1.4.0"
177+
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
178+
dependencies:
179+
wrappy "1"
180+
181+
path-is-absolute@^1.0.0:
182+
version "1.0.1"
183+
resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
184+
185+
strip-ansi@^4.0.0:
186+
version "4.0.0"
187+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
188+
dependencies:
189+
ansi-regex "^3.0.0"
190+
191+
supports-color@5.4.0:
192+
version "5.4.0"
193+
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
194+
dependencies:
195+
has-flag "^3.0.0"
196+
13197
vscode-css-languageservice@^3.0.9-next.18:
14198
version "3.0.9-next.18"
15199
resolved "https://registry.yarnpkg.com/vscode-css-languageservice/-/vscode-css-languageservice-3.0.9-next.18.tgz#f8f25123b5a8cdc9f72fafcd2c0088f726322437"
@@ -53,3 +237,11 @@ vscode-nls@^3.2.2:
53237
vscode-uri@^1.0.1:
54238
version "1.0.1"
55239
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.1.tgz#11a86befeac3c4aa3ec08623651a3c81a6d0bbc8"
240+
241+
wrappy@1:
242+
version "1.0.2"
243+
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
244+
245+
xml@^1.0.0:
246+
version "1.0.1"
247+
resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"

0 commit comments

Comments
 (0)