adjusting logs and tweaking build tasks

microsoft · Aug 1, 2024 · 1268935 · 1268935
1 parent 814c24c
commit 1268935
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/run-integrationTests-dotnet.yaml b/.github/workflows/run-integrationTests-dotnet.yaml
@@ -106,7 +106,7 @@ jobs:
 
         echo "Starting the integration test"
         echo "Running: docker exec ${DEV_CONTAINER_NAME} bash -c \"/spacefx-dev/debugShim-deploy.sh --debug_shim ${{ inputs.app_name }} --python_file /workspace/${{ inputs.app_name }}/test/integrationTests_python/integrationTest.py --disable_plugin_configs --port 5678\""
-        docker exec ${DEV_CONTAINER_NAME} bash -c "/spacefx-dev/debugShim-deploy.sh --debug_shim ${{ inputs.app_name }} --python_file /workspace/${{ inputs.app_name }}/test/integrationTests_python/integrationTest.py --disable_plugin_configs --port 5678" &
+        docker exec ${DEV_CONTAINER_NAME} bash -c "/spacefx-dev/debugShim-deploy.sh --debug_shim ${{ inputs.app_name }} --python_file /workspace/${{ inputs.app_name }}/test/integrationTests_python/integrationTest.py --disable_plugin_configs --port 5678"
 
         echo "k3s kubectl exec -n payload-app deploy/${{ inputs.app_name }} -- bash -c \"/workspace/${{ inputs.app_name }}/.git/spacefx-dev/dotnet/dotnet test --verbosity detailed /workspace/${{ inputs.app_name }}/test/integrationTests/bin/Debug/net6.0/integrationTests.dll --logger \"junit;LogFileName=/workspace/${{ inputs.app_name }}/.git/test-results.xml\"\" &"
         (

diff --git a/.github/workflows/run-integrationTests-python.yaml b/.github/workflows/run-integrationTests-python.yaml
@@ -107,7 +107,7 @@ jobs:
         echo "Starting the integration test"
 
         echo "Running: docker exec ${DEV_CONTAINER_NAME} bash -c \"/spacefx-dev/debugShim-deploy.sh --debug_shim ${{ inputs.app_name }} --python_file /workspace/${{ inputs.app_name }}/test/integrationTests_python/integrationTest.py --disable_plugin_configs --port 5678\""
-        docker exec ${DEV_CONTAINER_NAME} bash -c "/spacefx-dev/debugShim-deploy.sh --debug_shim ${{ inputs.app_name }} --python_file /workspace/${{ inputs.app_name }}/test/integrationTests_python/integrationTest.py --disable_plugin_configs --port 5678" &
+        docker exec ${DEV_CONTAINER_NAME} bash -c "/spacefx-dev/debugShim-deploy.sh --debug_shim ${{ inputs.app_name }} --python_file /workspace/${{ inputs.app_name }}/test/integrationTests_python/integrationTest.py --disable_plugin_configs --port 5678"
         echo "k3s kubectl exec -n payload-app deploy/${{ inputs.app_name }} -- bash -c \"cd /workspace/${{ inputs.app_name }}/test/integrationTests_python && /python3 /workspace/${{ inputs.app_name }}/test/integrationTests_python/integrationTest.py\" &"
         (
             # Reroute the stdout to a file so we can uniquely identify this run
@@ -119,7 +119,7 @@ jobs:
         ) &
 
         client_pid=$!
-        
+
         echo "Waiting for the integration test host to finish..."
         client_pid_return_code=0
         wait "$client_pid"
@@ -133,4 +133,3 @@ jobs:
 
         exit $client_pid_return_code
         echo "--------------------"
-       
diff --git a/src/Client.cs b/src/Client.cs
@@ -281,7 +281,7 @@ public bool IsHealthy() {
             _logger.LogTrace("Received Health Check request from cluster. Triggering IsAppHealthy event handler.");
             try {
                 bool isHealthy = IsAppHealthy();
-                _logger.LogInformation($"IsAppHealthy returned '{isHealthy}'.");
+                _logger.LogDebug($"IsAppHealthy returned '{isHealthy}'.");
                 if (!isHealthy) {
                     _logger.LogCritical("IsAppHealthy returned 'false' and is unhealthy. Check logs for more details.");
                 }

diff --git a/test/integrationTests/Tests/ServicesHeardTests.cs b/test/integrationTests/Tests/ServicesHeardTests.cs
@@ -29,7 +29,7 @@ public void CheckServicesAreHeard() {
 
     [Fact]
     public void HealthCheckTest() {
-        DateTime maxTimeToWait = DateTime.Now.Add(TestSharedContext.MAX_TIMESPAN_TO_WAIT_FOR_MSG);
+        DateTime maxTimeToWait = DateTime.Now.Add(TimeSpan.FromMinutes(5));
 
 
         while (_context.HEALTH_CHECK_RECEIVED == false && DateTime.Now <= maxTimeToWait) {