Merge branch 'v2' into inlineScriptTests

microsoft · Jun 3, 2019 · 54ffdeb · 54ffdeb
2 parents 81090a0 + ce28a2b
commit 54ffdeb
Show file tree

Hide file tree

Showing 18 changed files with 1,975 additions and 1,235 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -67,20 +67,24 @@
             "name": "debug integration test",
             "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
             "env": {
-                "MSFT_TEST_DA_PORT": "4712",
+                // TEST_DA_PORT: Enable this to debug the debug-adapter while the tests are running (The test will look for a debug-adapter server on port 4712 instead of launching a new one)
+                // "TEST_DA_PORT": "4712",
+                // TEST_TIMEOUT_MULTIPLIER: The tests have long timeouts for the CI server. While debugging locally it's sometimes useful to reduce the timeouts, to be able to run all the tests faster when they are failing. This value is a multiplier that will be applied to all timeouts using during the tests... (Work in progress)
+                "TEST_TIMEOUT_MULTIPLIER": "0.4"
             },
             "args": [
                 "--require", "source-map-support/register",
                 "-u", "tdd",
                 "--timeout", "999999",
                 "--colors",
-                "--grep", "%     2",
+                "--grep", "",
                 "--reporter", "node_modules/vscode-chrome-debug-core-testsupport/out/loggingReporter.js",
                 "${workspaceFolder}/out/test/int/**/*.test.js",
             ],
             "skipFiles": [
                 "<node_internals>/**",
-                "methodCalledLogger.ts",
+                "methodsCalledLogger.ts",
+                "printObjectDescription.ts",
                 "runnable.js",
                 "runner.js",
                 "next_tick.js",