adopt test-extension for colorize & configuration-editing (microsoft#…

…195691) * adopt test-extension for colorize & configuration-editing * update * fixes
tjm002 · Nov 17, 2023 · 31e5940 · 31e5940
1 parent b277683
commit 31e5940
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/.vscode-test.js b/.vscode-test.js
@@ -31,6 +31,16 @@ const extensions = [
 		workspaceFolder: path.join(os.tmpdir(), `nbout-${Math.floor(Math.random() * 100000)}`),
 		mocha: { timeout: 60_000 }
 	},
+	{
+		label: 'vscode-colorize-tests',
+		workspaceFolder: `extensions/vscode-colorize-tests/test`,
+		mocha: { timeout: 60_000 }
+	},
+	{
+		label: 'configuration-editing',
+		workspaceFolder: path.join(os.tmpdir(), `confeditout-${Math.floor(Math.random() * 100000)}`),
+		mocha: { timeout: 60_000 }
+	},
 	{
 		label: 'github-authentication',
 		workspaceFolder: path.join(os.tmpdir(), `msft-auth-${Math.floor(Math.random() * 100000)}`),

diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat
@@ -49,7 +49,7 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.
 echo ### Colorize tests
-call "%INTEGRATION_TEST_ELECTRON_PATH%" %~dp0\..\extensions\vscode-colorize-tests\test --extensionDevelopmentPath=%~dp0\..\extensions\vscode-colorize-tests --extensionTestsPath=%~dp0\..\extensions\vscode-colorize-tests\out %API_TESTS_EXTRA_ARGS%
+call yarn test-extension -l vscode-colorize-tests
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.
@@ -89,7 +89,7 @@ echo.
 echo ### Configuration editing tests
 set CFWORKSPACE=%TEMPDIR%\cf-%RANDOM%
 mkdir %CFWORKSPACE%
-call "%INTEGRATION_TEST_ELECTRON_PATH%" %CFWORKSPACE% --extensionDevelopmentPath=%~dp0\..\extensions\configuration-editing --extensionTestsPath=%~dp0\..\extensions\configuration-editing\out\test %API_TESTS_EXTRA_ARGS%
+call yarn test-extension -l configuration-editing
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 echo.

diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh
@@ -67,7 +67,7 @@ kill_app
 echo
 echo "### Colorize tests"
 echo
-"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/vscode-colorize-tests/test --extensionDevelopmentPath=$ROOT/extensions/vscode-colorize-tests --extensionTestsPath=$ROOT/extensions/vscode-colorize-tests/out $API_TESTS_EXTRA_ARGS
+yarn test-extension -l vscode-colorize-tests
 kill_app
 
 echo
@@ -109,7 +109,7 @@ kill_app
 echo
 echo "### Configuration editing tests"
 echo
-"$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $(mktemp -d 2>/dev/null) --extensionDevelopmentPath=$ROOT/extensions/configuration-editing --extensionTestsPath=$ROOT/extensions/configuration-editing/out/test $API_TESTS_EXTRA_ARGS
+yarn test-extension -l configuration-editing
 kill_app
 
 echo