Merge pull request #1 from akselsson/verify-allow-folder

Verify integration tests use web site unit
asimov-deploy · May 19, 2021 · 441513e · 441513e
2 parents dcc8f95 + 1d88485
commit 441513e
Show file tree

Hide file tree

Showing 11 changed files with 3,699 additions and 270 deletions.
diff --git a/src/AsimovDeploy.WinAgent.IntegrationTests/Scenarios/VerifyScenario/ConfigFiles/config.json b/src/AsimovDeploy.WinAgent.IntegrationTests/Scenarios/VerifyScenario/ConfigFiles/config.json
diff --git a/...ent.IntegrationTests/Scenarios/VerifyScenario/Packages/PSTest-v1.0.0.0-[master]-[123].zip b/...ent.IntegrationTests/Scenarios/VerifyScenario/Packages/PSTest-v1.0.0.0-[master]-[123].zip
diff --git a/...AsimovDeploy.WinAgent.IntegrationTests/Scenarios/VerifyScenario/VerifyScenarioScenario.cs b/...AsimovDeploy.WinAgent.IntegrationTests/Scenarios/VerifyScenario/VerifyScenarioScenario.cs
diff --git a/src/AsimovDeploy.WinAgent.IntegrationTests/Scenarios/WebScenario/ConfigFiles/config.json b/src/AsimovDeploy.WinAgent.IntegrationTests/Scenarios/WebScenario/ConfigFiles/config.json
@@ -66,6 +66,33 @@ Remove-WebAppPool -Name \"${SiteName}AppPool\"
         "Install": "install-site.ps1 $SiteName $SiteUrl",
         "Uninstall": "uninstall-site.ps1 $SiteName"
       }
+    },
+    {
+      "Name": "Asimov.Web.Example.With.Verify",
+      "Type": "WebSite",
+      "SiteName": "Asimov.Web.Example.With.Verify",
+      "SiteUrl": "http://localhost:9124",
+
+      "PackageInfo": { "Source": "Test" },
+
+      "Installable": {
+        "TargetPath": "%DATA_FOLDER%\\WebTarget",
+
+        "Install": "install-site.ps1 $SiteName $SiteUrl",
+        "Uninstall": "uninstall-site.ps1 $SiteName"
+      },
+      "Actions": {
+        "Verify1": {
+          "Type": "VerifyCommand",
+          "ZipPath": "verify.folder",
+          "Command": "script.bat"
+        },
+        "Verify2": {
+          "Type": "VerifyCommand",
+          "ZipPath": "verify.zip",
+          "Command": "script.bat"
+        }
+      }
     }
 
 

diff --git a/...t.IntegrationTests/Scenarios/WebScenario/Packages/web.example-v1.0.0.0-[master]-[123].zip b/...t.IntegrationTests/Scenarios/WebScenario/Packages/web.example-v1.0.0.0-[master]-[123].zip
diff --git a/src/AsimovDeploy.WinAgent.IntegrationTests/Scenarios/WebScenario/WebFromScriptScenario.cs b/src/AsimovDeploy.WinAgent.IntegrationTests/Scenarios/WebScenario/WebFromScriptScenario.cs
@@ -13,47 +13,14 @@
 namespace AsimovDeploy.WinAgent.IntegrationTests.Scenarios.WebScenario
 {
     [TestFixture]
-    public class WebFromScriptScenario : WinAgentSystemTest
+    public class WebFromScriptScenario : WebScenarioBase
     {
-        private const string ServiceName = "Asimov.Web.Example.From.Script";
-
-        public override void Given()
-        {
-            GivenFoldersForScenario();
-            GivenRunningAgent();
-            EnsureServiceIsNotInstalled();
-        }
-
-        [TearDown]
-        public void AfterEach()
-        {
-            EnsureServiceIsNotInstalled();
-        }
-
-        private void EnsureServiceIsNotInstalled()
-        {
-            var units = Agent.Get<List<DeployUnitInfoDTO>>("/units/list");
-            if (units[1].status == "NotFound")
-            {
-                return;
-            }
-            Agent.Post("/action",NodeFront.ApiKey, new UnitActionCommand()
-            {
-                actionName = "Uninstall",
-                unitName = ServiceName
-            });
-            WaitForStatus("NotFound");
-            while (Process.GetProcesses().Any(x => x.ProcessName == "Asimov.Roundhouse.Example"))
-            {
-                Thread.Sleep(TimeSpan.FromSeconds(0.5));
-            }
-        }
+        protected override string ServiceName => "Asimov.Web.Example.From.Script";
 
         [Test]
         public void can_get_deploy_units()
         {
             var units = Agent.Get<List<DeployUnitInfoDTO>>("/units/list");
-            units.Count.ShouldBe(2);
             units[1].name.ShouldBe(ServiceName);
             units[1].status.ShouldBe("NotFound");
             units[1].type.ShouldBe(DeployUnitTypes.WebSite);
@@ -65,51 +32,9 @@ public void installs_service_on_deploy()
             InstallService();
 
             var units = Agent.Get<List<DeployUnitInfoDTO>>("/units/list");
-            units.Count.ShouldBe(2);
             units[1].name.ShouldBe(ServiceName);
             units[1].status.ShouldBe("Running");
             units[1].type.ShouldBe(DeployUnitTypes.WebSite);
         }
-
-        private void InstallService()
-        {
-            var versions = Agent.Get<List<DeployUnitVersionDTO>>($"/versions/{ServiceName}");
-            versions.Count.ShouldBe(1);
-
-            Agent.Post("/deploy/deploy", NodeFront.ApiKey, new DeployCommand
-            {
-                unitName = ServiceName,
-                versionId = versions[0].id,
-                parameters = new Dictionary<string, object>() {
-                {
-                    "Port", "8145"
-                } }
-            });
-
-            WaitForStatus("Running");
-        }
-
-        private void WaitForStatus(string expectedStatus)
-        {
-            var start = DateTime.Now;
-            var timeout = TimeSpan.FromSeconds(10);
-            var duration = DateTime.Now - start;
-            var status = "";
-
-            do
-            {
-                duration = DateTime.Now - start;
-                var units = Agent.Get<List<DeployUnitInfoDTO>>("/units/list");
-                units.Count.ShouldBe(2);
-                status = units[1].status;
-                if (status == expectedStatus)
-                {
-                    return;
-                }
-            } while (duration < timeout);
-
-            Assert.Fail($"Failed to go to correct status, was {status} expected {expectedStatus}");
-
-        }
     }
 }
diff --git a/src/AsimovDeploy.WinAgent.IntegrationTests/Scenarios/WebScenario/WebScenario.cs b/src/AsimovDeploy.WinAgent.IntegrationTests/Scenarios/WebScenario/WebScenario.cs
@@ -1,59 +1,21 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
+using System.Collections.Generic;
 using AsimovDeploy.WinAgent.Framework.Configuration;
 using AsimovDeploy.WinAgent.Framework.Models;
-using AsimovDeploy.WinAgent.Web.Commands;
 using AsimovDeploy.WinAgent.Web.Contracts;
 using NUnit.Framework;
 using Shouldly;
 
 namespace AsimovDeploy.WinAgent.IntegrationTests.Scenarios.WebScenario
 {
     [TestFixture]
-    public class WebScenario : WinAgentSystemTest
+    public class WebScenario : WebScenarioBase
     {
-        private const string ServiceName = "Asimov.Web.Example";
-
-        public override void Given()
-        {
-            GivenFoldersForScenario();
-            GivenRunningAgent();
-            EnsureServiceIsNotInstalled();
-        }
-
-        [TearDown]
-        public void AfterEach()
-        {
-            EnsureServiceIsNotInstalled();
-        }
-
-        private void EnsureServiceIsNotInstalled()
-        {
-            var units = Agent.Get<List<DeployUnitInfoDTO>>("/units/list");
-            if (units[0].status == "NotFound")
-            {
-                return;
-            }
-            Agent.Post("/action",NodeFront.ApiKey, new UnitActionCommand()
-            {
-                actionName = "Uninstall",
-                unitName = ServiceName
-            });
-            WaitForStatus("NotFound");
-            while (Process.GetProcesses().Any(x => x.ProcessName == "Asimov.Roundhouse.Example"))
-            {
-                Thread.Sleep(TimeSpan.FromSeconds(0.5));
-            }
-        }
+        protected override string ServiceName => "Asimov.Web.Example";
 
         [Test]
         public void can_get_deploy_units()
         {
             var units = Agent.Get<List<DeployUnitInfoDTO>>("/units/list");
-            units.Count.ShouldBe(2);
             units[0].name.ShouldBe(ServiceName);
             units[0].status.ShouldBe("NotFound");
             units[0].type.ShouldBe(DeployUnitTypes.WebSite);
@@ -65,30 +27,11 @@ public void installs_service_on_deploy()
             InstallService();
 
             var units = Agent.Get<List<DeployUnitInfoDTO>>("/units/list");
-            units.Count.ShouldBe(2);
             units[0].name.ShouldBe(ServiceName);
             units[0].status.ShouldBe("Running");
             units[0].type.ShouldBe(DeployUnitTypes.WebSite);
         }
 
-        private void InstallService()
-        {
-            var versions = Agent.Get<List<DeployUnitVersionDTO>>($"/versions/{ServiceName}");
-            versions.Count.ShouldBe(1);
-
-            Agent.Post("/deploy/deploy", NodeFront.ApiKey, new DeployCommand
-            {
-                unitName = ServiceName,
-                versionId = versions[0].id,
-                parameters = new Dictionary<string, object>() {
-                {
-                    "Port", "8145"
-                } }
-            });
-
-            WaitForStatus("Running");
-        }
-
         [Test]
         public void when_NotFound_gets_install_parameters()
         {
@@ -109,28 +52,5 @@ public void when_Installed_gets_deploy_parameters()
             parameters.Count.ShouldBe(1);
             parameters[0].Name.ShouldBe("NotUsed");
         }
-
-        private void WaitForStatus(string expectedStatus)
-        {
-            var start = DateTime.Now;
-            var timeout = TimeSpan.FromSeconds(10);
-            var duration = DateTime.Now - start;
-            var status = "";
-
-            do
-            {
-                duration = DateTime.Now - start;
-                var units = Agent.Get<List<DeployUnitInfoDTO>>("/units/list");
-                units.Count.ShouldBe(2);
-                status = units[0].status;
-                if (status == expectedStatus)
-                {
-                    return;
-                }
-            } while (duration < timeout);
-
-            Assert.Fail($"Failed to go to correct status, was {status} expected {expectedStatus}");
-
-        }
     }
 }