Merge branch 'main' into al/test-workflow

microsoft · Jul 22, 2024 · 4eed4a3 · 4eed4a3
2 parents fe31ae2 + e1743df
commit 4eed4a3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -17,8 +17,7 @@
             "app_name": "platform-deployment",
             "app_type": "sdk-service",
             "addl_debug_shim_suffixes": "client",
-            "debug_shim_post_yaml_file": "/workspace/platform-deployment/.vscode/debugShim-svcAcct-clusterAdmin.yaml",
-            "smb_enabled_in_cluster": "true"
+            "debug_shim_post_yaml_file": "/workspace/platform-deployment/.vscode/debugShim-svcAcct-clusterAdmin.yaml"
         }
     },
     "customizations": {

diff --git a/test/integrationTests/TestSharedContext.cs b/test/integrationTests/TestSharedContext.cs
@@ -14,7 +14,7 @@ public class TestSharedContext : IDisposable {
     internal static k8s.Kubernetes K8S_CLIENT = null!;
     internal static Core.Client SPACEFX_CLIENT = null!;
     internal static bool HOST_SVC_ONLINE = false;
-    internal static TimeSpan MAX_TIMESPAN_TO_WAIT_FOR_MSG = TimeSpan.FromSeconds(90);
+    internal static TimeSpan MAX_TIMESPAN_TO_WAIT_FOR_MSG = TimeSpan.FromSeconds(300);
 
     /// <summary>
     /// Setup the SpaceFx Core to be shared across tests

diff --git a/test/integrationTests/Tests/DeploymentTest.cs b/test/integrationTests/Tests/DeploymentTest.cs
@@ -13,7 +13,7 @@ public DeploymentTests(TestSharedContext context) {
     [Fact]
     public async Task DeployAnApp() {
         const string testName = nameof(DeployAnApp);
-        bool podFound = false;
+        k8s.Models.V1Pod? integrationPod = null;
         DateTime maxTimeToWait = DateTime.Now.Add(TestSharedContext.MAX_TIMESPAN_TO_WAIT_FOR_MSG);
         MessageFormats.HostServices.Link.LinkResponse? jsonFileResponse = null;
         MessageFormats.HostServices.Link.LinkResponse? yamlFileResponse = null;
@@ -27,8 +27,8 @@ public async Task DeployAnApp() {
 
         var result = await TestSharedContext.K8S_CLIENT.CoreV1.ListPodForAllNamespacesWithHttpMessagesAsync(allowWatchBookmarks: false, watch: false, pretty: true);
         podList = result.Body as k8s.Models.V1PodList ?? throw new Exception("Failed to get Pod List");
-        podFound = podList.Items.Any(pod => pod.Name().Contains("integration-test", StringComparison.CurrentCultureIgnoreCase));
-        Assert.False(podFound);
+        integrationPod = podList.Items.FirstOrDefault(pod => pod.Name().Contains("integration-test", StringComparison.CurrentCultureIgnoreCase));
+        Assert.Null(integrationPod);
 
         Console.WriteLine("Integration Test Pod not found.  Continuing with test");
 
@@ -131,16 +131,18 @@ void LinkResponseEventHandler(object? _, MessageFormats.HostServices.Link.LinkRe
         DateTime maxTimeToWaitForDeployment = DateTime.Now.Add(TestSharedContext.MAX_TIMESPAN_TO_WAIT_FOR_MSG);
         Console.WriteLine("Starting polling to wait for deployment...");
 
-        while (!podFound && DateTime.Now <= maxTimeToWaitForDeployment) {
+        while (integrationPod == null && DateTime.Now <= maxTimeToWaitForDeployment) {
             result = await TestSharedContext.K8S_CLIENT.CoreV1.ListPodForAllNamespacesWithHttpMessagesAsync(allowWatchBookmarks: false, watch: false, pretty: true);
             podList = result.Body as k8s.Models.V1PodList ?? throw new Exception("Failed to get Pod List");
-            podFound = podList.Items.Any(pod => pod.Name().Contains("integration-test", StringComparison.CurrentCultureIgnoreCase));
-            Console.WriteLine($"...pod found: {podFound}");
-            if (!podFound) await Task.Delay(5000);
+            integrationPod = podList.Items.FirstOrDefault(pod => pod.Name().Contains("integration-test", StringComparison.CurrentCultureIgnoreCase) && pod.Status.Phase == "Running");
+            Console.WriteLine($"...pod found: {integrationPod == null}");
+            if (integrationPod == null)
+                await Task.Delay(5000);
         }
 
-        if (podFound == false) throw new TimeoutException($"Failed to find deployment after {TestSharedContext.MAX_TIMESPAN_TO_WAIT_FOR_MSG}.  Please check that {TestSharedContext.TARGET_SVC_APP_ID} is deployed");
-        Assert.True(podFound);
+        if (integrationPod == null || integrationPod?.Status.Phase == "Pending") throw new TimeoutException($"Failed to find deployment after {TestSharedContext.MAX_TIMESPAN_TO_WAIT_FOR_MSG}.  Please check that {TestSharedContext.TARGET_SVC_APP_ID} is deployed");
+        Assert.NotNull(integrationPod);
+        Assert.Equal("Running", integrationPod.Status.Phase);
 
         string recdFile = Path.Combine((await TestSharedContext.SPACEFX_CLIENT.GetXFerDirectories()).inbox_directory, "astronaut.jpg");
 
@@ -158,20 +160,20 @@ void LinkResponseEventHandler(object? _, MessageFormats.HostServices.Link.LinkRe
         Console.WriteLine("Integration Test Pod Found.  Waiting for deletion (max 3 mins)");
         maxTimeToWaitForDeployment = DateTime.Now.Add(TimeSpan.FromMinutes(3));
 
-        while (podFound && DateTime.Now <= maxTimeToWaitForDeployment) {
+        while (integrationPod != null && DateTime.Now <= maxTimeToWaitForDeployment) {
             result = await TestSharedContext.K8S_CLIENT.CoreV1.ListPodForAllNamespacesWithHttpMessagesAsync(allowWatchBookmarks: false, watch: false, pretty: true);
             podList = result.Body as k8s.Models.V1PodList ?? throw new Exception("Failed to get Pod List");
-            podFound = podList.Items.Any(pod => pod.Name().Contains("integration-test", StringComparison.CurrentCultureIgnoreCase));
-            Console.WriteLine($"...pod found: {podFound}");
-            if (podFound) await Task.Delay(5000);
+            integrationPod = podList.Items.FirstOrDefault(pod => pod.Name().Contains("integration-test", StringComparison.CurrentCultureIgnoreCase));
+            Console.WriteLine($"...pod found: {integrationPod != null}");
+            if (integrationPod != null) await Task.Delay(5000);
         }
 
-        if (podFound == true) throw new TimeoutException($"Failed to remove deployment after {TimeSpan.FromMinutes(3)}.  Please check that {TestSharedContext.TARGET_SVC_APP_ID} is deployed");
+        if (integrationPod != null) throw new TimeoutException($"Failed to remove deployment after {TimeSpan.FromMinutes(3)}.  Please check that {TestSharedContext.TARGET_SVC_APP_ID} is deployed");
 
 
 
 
         Console.WriteLine("Integration Test Pod successfully removed.");
-        Assert.False(podFound);
+        Assert.Null(integrationPod);
     }
 }