Merge branch 'master' into remove-elasticsearch-async

beniwohli · web-flow · commit 41a43031b50b · 2020-10-28T08:01:38.000+01:00
diff --git a/docs/configuration.asciidoc b/docs/configuration.asciidoc
@@ -135,7 +135,7 @@ When set to false, the agent will not collect any data, nor start any background
 [options="header"]
 |============
 | Environment             | Django/Flask   | Default
-| `ELASTIC_APM_RECORDING` | `RECORDING`    | `false`
+| `ELASTIC_APM_RECORDING` | `RECORDING`    | `true`
 |============
 
 Enable or disable recording of events.
diff --git a/scripts/run-tests.bat b/scripts/run-tests.bat
@@ -15,9 +15,9 @@ if "%VERSION%" == "2.7" set IGNORE_PYTHON3_WITH_PYTHON2=--ignore-glob="*\py3_*.p
 
 set PYTEST_JUNIT="--junitxml=.\tests\python-agent-junit.xml"
 if "%ASYNCIO%" == "true" (
-    call %PYTHON%\python.exe -m pytest %PYTEST_JUNIT% %IGNORE_PYTHON3_WITH_PYTHON2% --cov --cov-context=test --cov-branch --cov-config=setup.cfg -m "not integrationtest"
+    %PYTHON%\python.exe -m pytest %PYTEST_JUNIT% %IGNORE_PYTHON3_WITH_PYTHON2% --cov --cov-context=test --cov-branch --cov-config=setup.cfg -m "not integrationtest" || exit /b 1
 )
 if "%ASYNCIO%" == "false" (
-    call %PYTHON%\python.exe -m pytest %PYTEST_JUNIT% --ignore-glob="*\asyncio*\*" %IGNORE_PYTHON3_WITH_PYTHON2% --cov --cov-context=test --cov-branch --cov-config=setup.cfg -m "not integrationtest"
+    %PYTHON%\python.exe -m pytest %PYTEST_JUNIT% --ignore-glob="*\asyncio*\*" %IGNORE_PYTHON3_WITH_PYTHON2% --cov --cov-context=test --cov-branch --cov-config=setup.cfg -m "not integrationtest" || exit /b 1
 )
 call %PYTHON%\python.exe setup.py bdist_wheel

Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@ if "%VERSION%" == "2.7" set IGNORE_PYTHON3_WITH_PYTHON2=--ignore-glob="\py3_.p`
`15`	`15`
`16`	`16`	`set PYTEST_JUNIT="--junitxml=.\tests\python-agent-junit.xml"`
`17`	`17`	`if "%ASYNCIO%" == "true" (`
`18`		`- call %PYTHON%\python.exe -m pytest %PYTEST_JUNIT% %IGNORE_PYTHON3_WITH_PYTHON2% --cov --cov-context=test --cov-branch --cov-config=setup.cfg -m "not integrationtest"`
	`18`	`+ %PYTHON%\python.exe -m pytest %PYTEST_JUNIT% %IGNORE_PYTHON3_WITH_PYTHON2% --cov --cov-context=test --cov-branch --cov-config=setup.cfg -m "not integrationtest" \|\| exit /b 1`
`19`	`19`	`)`
`20`	`20`	`if "%ASYNCIO%" == "false" (`
`21`		`- call %PYTHON%\python.exe -m pytest %PYTEST_JUNIT% --ignore-glob="\asyncio\*" %IGNORE_PYTHON3_WITH_PYTHON2% --cov --cov-context=test --cov-branch --cov-config=setup.cfg -m "not integrationtest"`
	`21`	`+ %PYTHON%\python.exe -m pytest %PYTEST_JUNIT% --ignore-glob="\asyncio\*" %IGNORE_PYTHON3_WITH_PYTHON2% --cov --cov-context=test --cov-branch --cov-config=setup.cfg -m "not integrationtest" \|\| exit /b 1`
`22`	`22`	`)`
`23`	`23`	`call %PYTHON%\python.exe setup.py bdist_wheel`