From 3a8cdd84405a42c19ab5b4b7fe1a5b309be388a3 Mon Sep 17 00:00:00 2001
From: Aasim Khan <aasimkhan30@gmail.com>
Date: Thu, 6 Oct 2022 16:05:56 -0700
Subject: [PATCH] Updating integration test script and adding additional
 logging.  (#20710)

* killing all sub proc

* Updating file to match vscode

* Adding addtional logging

* Removing inaccurate echo
---
 scripts/test-integration.sh | 41 +++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/scripts/test-integration.sh b/scripts/test-integration.sh
index 4b96794b3c..a3812458be 100755
--- a/scripts/test-integration.sh
+++ b/scripts/test-integration.sh
@@ -49,7 +49,6 @@ else
 
 	# Configuration for more verbose output
 	export VSCODE_CLI=1
-	export ELECTRON_ENABLE_STACK_DUMPING=1
 	export ELECTRON_ENABLE_LOGGING=1
 
 	echo "Storing crash reports into '$VSCODECRASHDIR'."
@@ -58,21 +57,33 @@ else
 fi
 
 if [ -z "$INTEGRATION_TEST_APP_NAME" ]; then
-	after_suite() { true; }
+	kill_app() {
+		true;
+	}
 else
-	after_suite() { killall $INTEGRATION_TEST_APP_NAME || true; }
+	kill_app() {
+		echo "Killing integration test app"
+		killall $INTEGRATION_TEST_APP_NAME || true;
+	}
 fi
 
+print_subprocesses() {
+	echo "Subprocesses:"
+	ps -axf | grep $$
+}
 
 # Tests standalone (AMD)
 
+echo
+echo "### node.js integration tests"
+echo
+print_subprocesses
 ./scripts/test.sh --runGlob **/*.integrationTest.js "$@"
-after_suite
-
+print_subprocesses
 
 # Tests in the extension host
 
-ALL_PLATFORMS_API_TESTS_EXTRA_ARGS="--disable-telemetry --skip-welcome --skip-release-notes --crash-reporter-directory=$VSCODECRASHDIR --logsPath=$VSCODELOGSDIR --no-cached-data --disable-updates --disable-extensions --disable-workspace-trust --user-data-dir=$VSCODEUSERDATADIR"
+ALL_PLATFORMS_API_TESTS_EXTRA_ARGS="--disable-telemetry --skip-welcome --skip-release-notes --crash-reporter-directory=$VSCODECRASHDIR --logsPath=$VSCODELOGSDIR --no-cached-data --disable-updates --disable-keytar --disable-extensions --disable-workspace-trust --user-data-dir=$VSCODEUSERDATADIR"
 
 # {{SQL CARBON EDIT}} Don't run tests for unused extensions
 # "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/vscode-api-tests/testWorkspace --enable-proposed-api=vscode.vscode-api-tests --extensionDevelopmentPath=$ROOT/extensions/vscode-api-tests --extensionTestsPath=$ROOT/extensions/vscode-api-tests/out/singlefolder-tests $ALL_PLATFORMS_API_TESTS_EXTRA_ARGS
@@ -93,11 +104,25 @@ ALL_PLATFORMS_API_TESTS_EXTRA_ARGS="--disable-telemetry --skip-welcome --skip-re
 # "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/emmet/test-workspace --extensionDevelopmentPath=$ROOT/extensions/emmet --extensionTestsPath=$ROOT/extensions/emmet/out/test $ALL_PLATFORMS_API_TESTS_EXTRA_ARGS
 # after_suite
 
+echo
+echo "### Git tests"
+echo
+print_subprocesses
 "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $(mktemp -d 2>/dev/null) --enable-proposed-api=vscode.git --extensionDevelopmentPath=$ROOT/extensions/git --extensionTestsPath=$ROOT/extensions/git/out/test $ALL_PLATFORMS_API_TESTS_EXTRA_ARGS
-after_suite
+print_subprocesses
+kill_app
+print_subprocesses
 
+
+echo
+echo "### Azure Core tests"
+echo
+print_subprocesses
 "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $ROOT/extensions/azurecore/test-fixtures --extensionDevelopmentPath=$ROOT/extensions/azurecore --extensionTestsPath=$ROOT/extensions/azurecore/out/test $ALL_PLATFORMS_API_TESTS_EXTRA_ARGS
-after_suite
+print_subprocesses
+kill_app
+print_subprocesses
+
 
 # "$INTEGRATION_TEST_ELECTRON_PATH" $LINUX_EXTRA_ARGS $(mktemp -d 2>/dev/null) --extensionDevelopmentPath=$ROOT/extensions/ipynb --extensionTestsPath=$ROOT/extensions/ipynb/out/test $ALL_PLATFORMS_API_TESTS_EXTRA_ARGS
 # after_suite