Add flag to skip python install integration tests. (#5119)

This commit is contained in:
Cory Rivera
2019-04-18 17:13:19 -07:00
committed by GitHub
parent 880e3e10da
commit f248260584
2 changed files with 16 additions and 8 deletions

View File

@@ -4,14 +4,18 @@ pushd %~dp0\..
set VSCODEUSERDATADIR=%TMP%\adsuser-%RANDOM%-%TIME:~6,5% set VSCODEUSERDATADIR=%TMP%\adsuser-%RANDOM%-%TIME:~6,5%
set VSCODEEXTENSIONSDIR=%TMP%\adsext-%RANDOM%-%TIME:~6,5% set VSCODEEXTENSIONSDIR=%TMP%\adsext-%RANDOM%-%TIME:~6,5%
set PYTHON_TEST_PATH=%VSCODEUSERDATADIR%\TestPythonInstallation
echo %VSCODEUSERDATADIR% echo %VSCODEUSERDATADIR%
echo %VSCODEEXTENSIONSDIR% echo %VSCODEEXTENSIONSDIR%
echo %PYTHON_TEST_PATH%
@echo OFF @echo OFF
:: This first notebook test will do the python install that the later tests depend on if "%SKIP_PYTHON_INSTALL_TEST%" == "1" (
call .\scripts\code.bat --extensionDevelopmentPath=%~dp0\..\extensions\notebook --extensionTestsPath=%~dp0\..\extensions\notebook\out\integrationTest --user-data-dir=%VSCODEUSERDATADIR% --extensions-dir=%VSCODEEXTENSIONSDIR% --remote-debugging-port=9222 echo Skipping Python installation tests.
) else (
set PYTHON_TEST_PATH=%VSCODEUSERDATADIR%\TestPythonInstallation
echo %PYTHON_TEST_PATH%
call .\scripts\code.bat --extensionDevelopmentPath=%~dp0\..\extensions\notebook --extensionTestsPath=%~dp0\..\extensions\notebook\out\integrationTest --user-data-dir=%VSCODEUSERDATADIR% --extensions-dir=%VSCODEEXTENSIONSDIR% --remote-debugging-port=9222
)
call .\scripts\code.bat --extensionDevelopmentPath=%~dp0\..\extensions\integration-tests --extensionTestsPath=%~dp0\..\extensions\integration-tests\out --user-data-dir=%VSCODEUSERDATADIR% --extensions-dir=%VSCODEEXTENSIONSDIR% --remote-debugging-port=9222 call .\scripts\code.bat --extensionDevelopmentPath=%~dp0\..\extensions\integration-tests --extensionTestsPath=%~dp0\..\extensions\integration-tests\out --user-data-dir=%VSCODEUSERDATADIR% --extensions-dir=%VSCODEEXTENSIONSDIR% --remote-debugging-port=9222
if %errorlevel% neq 0 exit /b %errorlevel% if %errorlevel% neq 0 exit /b %errorlevel%

View File

@@ -12,14 +12,18 @@ else
VSCODEEXTDIR=`mktemp -d 2>/dev/null` VSCODEEXTDIR=`mktemp -d 2>/dev/null`
fi fi
export PYTHON_TEST_PATH=$VSCODEUSERDATADIR/TestPythonInstallation
cd $ROOT cd $ROOT
echo $VSCODEUSERDATADIR echo $VSCODEUSERDATADIR
echo $VSCODEEXTDIR echo $VSCODEEXTDIR
echo $PYTHON_TEST_PATH
./scripts/code.sh --extensionDevelopmentPath=$ROOT/extensions/notebook --extensionTestsPath=$ROOT/extensions/notebook/out/integrationTest --user-data-dir=$VSCODEUSERDATADIR --extensions-dir=$VSCODEEXTDIR --remote-debugging-port=9222 if [[ "$SKIP_PYTHON_INSTALL_TEST" == "1" ]]; then
echo Skipping Python installation tests.
else
export PYTHON_TEST_PATH=$VSCODEUSERDATADIR/TestPythonInstallation
echo $PYTHON_TEST_PATH
./scripts/code.sh --extensionDevelopmentPath=$ROOT/extensions/notebook --extensionTestsPath=$ROOT/extensions/notebook/out/integrationTest --user-data-dir=$VSCODEUSERDATADIR --extensions-dir=$VSCODEEXTDIR --remote-debugging-port=9222
fi
./scripts/code.sh --extensionDevelopmentPath=$ROOT/extensions/integration-tests --extensionTestsPath=$ROOT/extensions/integration-tests/out --user-data-dir=$VSCODEUSERDATADIR --extensions-dir=$VSCODEEXTDIR --remote-debugging-port=9222 ./scripts/code.sh --extensionDevelopmentPath=$ROOT/extensions/integration-tests --extensionTestsPath=$ROOT/extensions/integration-tests/out --user-data-dir=$VSCODEUSERDATADIR --extensions-dir=$VSCODEEXTDIR --remote-debugging-port=9222
rm -r -f $VSCODEUSERDATADIR rm -r -f $VSCODEUSERDATADIR