Enable diagnostic logging when running tests to catch random test fai…

…lures on CI agents (#387)
microsoft · Oct 14, 2019 · 34dc510 · 34dc510
1 parent 573fc3c
commit 34dc510
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 2 deletions.
diff --git a/build/testBuildImages.sh b/build/testBuildImages.sh
@@ -6,6 +6,11 @@
 
 set -e
 
+echo
+echo "Current list of running processes:"
+ps aux | less
+echo
+
 declare -r REPO_DIR=$( cd $( dirname "$0" ) && cd .. && pwd )
 declare -r buildBuildImagesScript="$REPO_DIR/build/buildBuildImages.sh"
 declare -r testProjectName="Oryx.BuildImage.Tests"
@@ -26,4 +31,20 @@ fi
 echo
 echo "Building and running tests..."
 cd "$TESTS_SRC_DIR/$testProjectName"
-dotnet test --test-adapter-path:. --logger:"xunit;LogFilePath=$ARTIFACTS_DIR\testResults\\$testProjectName.xml" -c $BUILD_CONFIGURATION
+
+artifactsDir="$REPO_DIR/artifacts"
+mkdir -p "$artifactsDir"
+diagnosticFileLocation="$artifactsDir/$testProjectName-log.txt"
+
+# Create a directory to capture any debug logs that MSBuild generates
+msbuildDebugLogsDir="$artifactsDir/msbuildDebugLogs"
+mkdir -p "$msbuildDebugLogsDir"
+export MSBUILDDEBUGPATH="$msbuildDebugLogsDir"
+export MSBUILDDISABLENODEREUSE=1
+
+dotnet test \
+    --diag "$diagnosticFileLocation" \
+    --verbosity diag \
+    --test-adapter-path:. \
+    --logger:"xunit;LogFilePath=$ARTIFACTS_DIR\testResults\\$testProjectName.xml" \
+    -c $BUILD_CONFIGURATION
diff --git a/build/testIntegration.sh b/build/testIntegration.sh
@@ -6,6 +6,11 @@
 
 set -e
 
+echo
+echo "Current list of running processes:"
+ps aux | less
+echo
+
 declare -r REPO_DIR=$( cd $( dirname "$0" ) && cd .. && pwd )
 source $REPO_DIR/build/__variables.sh
 
@@ -53,9 +58,20 @@ echo
 
 testProjectName="Oryx.Integration"
 cd "$TESTS_SRC_DIR/$testProjectName.Tests"
+artifactsDir="$REPO_DIR/artifacts"
+mkdir -p "$artifactsDir"
+diagnosticFileLocation="$artifactsDir/$testProjectName.Tests$integrationTestPlatform-log.txt"
+
+# Create a directory to capture any debug logs that MSBuild generates
+msbuildDebugLogsDir="$artifactsDir/msbuildDebugLogs"
+mkdir -p "$msbuildDebugLogsDir"
+export MSBUILDDEBUGPATH="$msbuildDebugLogsDir"
+export MSBUILDDISABLENODEREUSE=1
 
 dotnet test \
     $testCaseFilter \
+    --diag "$diagnosticFileLocation" \
+    --verbosity diag \
     --test-adapter-path:. \
     --logger:"xunit;LogFilePath=$ARTIFACTS_DIR/testResults/$testProjectName$integrationTestPlatform.Tests.xml" \
     -c $BUILD_CONFIGURATION
diff --git a/build/testRunTimeImages.sh b/build/testRunTimeImages.sh
@@ -6,6 +6,11 @@
 
 set -e
 
+echo
+echo "Current list of running processes:"
+ps aux | less
+echo
+
 declare -r REPO_DIR=$( cd $( dirname "$0" ) && cd .. && pwd )
 declare -r buildRuntimeImagesScript="$REPO_DIR/build/buildRunTimeImages.sh"
 declare -r testProjectName="Oryx.RuntimeImage.Tests"
@@ -26,4 +31,20 @@ fi
 echo
 echo "Building and running tests..."
 cd "$TESTS_SRC_DIR/$testProjectName"
-dotnet test --test-adapter-path:. --logger:"xunit;LogFilePath=$ARTIFACTS_DIR\testResults\\$testProjectName.xml" -c $BUILD_CONFIGURATION
+
+artifactsDir="$REPO_DIR/artifacts"
+mkdir -p "$artifactsDir"
+diagnosticFileLocation="$artifactsDir/$testProjectName-log.txt"
+
+# Create a directory to capture any debug logs that MSBuild generates
+msbuildDebugLogsDir="$artifactsDir/msbuildDebugLogs"
+mkdir -p "$msbuildDebugLogsDir"
+export MSBUILDDEBUGPATH="$msbuildDebugLogsDir"
+export MSBUILDDISABLENODEREUSE=1
+
+dotnet test \
+    --diag "$diagnosticFileLocation" \
+    --verbosity diag \
+    --test-adapter-path:. \
+    --logger:"xunit;LogFilePath=$ARTIFACTS_DIR\testResults\\$testProjectName.xml" \
+    -c $BUILD_CONFIGURATION