Add RequiresAdminOnWindows Attribute, and dont make test users (#788)

OctopusDeploy · Feb 5, 2024 · fb134bb · fb134bb
1 parent 18975d0
commit fb134bb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/source/Octopus.Tentacle.Tests.Integration/Startup/WindowsServiceConfiguratorFixture.cs b/source/Octopus.Tentacle.Tests.Integration/Startup/WindowsServiceConfiguratorFixture.cs
@@ -23,6 +23,7 @@ namespace Octopus.Tentacle.Tests.Integration.Startup
     public class WindowsServiceConfiguratorFixture
     {
         [Test]
+        [RequiresAdminOnWindows]
         public void CanInstallWindowsService()
         {
             const string serviceName = "OctopusShared.ServiceHelperTest";
@@ -70,6 +71,7 @@ public void CanInstallWindowsService()
         }
 
         [Test]
+        [RequiresAdminOnWindows]
         public void ThrowsOnBadServiceDependency()
         {
             const string serviceName = "OctopusShared.ServiceHelperTest";

diff --git a/...opus.Tentacle.Tests.Integration/Support/TestAttributes/RequiresAdminOnWindowsAttribute.cs b/...opus.Tentacle.Tests.Integration/Support/TestAttributes/RequiresAdminOnWindowsAttribute.cs
@@ -0,0 +1,9 @@
+using System;
+using NUnit.Framework;
+
+namespace Octopus.Tentacle.Tests.Integration.Support.TestAttributes
+{
+    [AttributeUsage(AttributeTargets.Method)]
+    public class RequiresAdminOnWindowsAttribute : CategoryAttribute
+    { }
+}
diff --git a/source/Octopus.Tentacle.Tests.Integration/Util/RunningScriptFixture.cs b/source/Octopus.Tentacle.Tests.Integration/Util/RunningScriptFixture.cs
@@ -27,7 +27,6 @@ public class RunningScriptFixture : IntegrationTest
         IScriptWorkspace workspace;
         TestScriptLog scriptLog;
         RunningScript runningScript;
-        TestUserPrincipal user;
 
         [SetUp]
         public void SetUpLocal()
@@ -39,7 +38,6 @@ public void SetUpLocal()
             {
                 testRootPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), $"OctopusTest-{nameof(RunningScriptFixture)}");
                 shell = new PowerShell();
-                user = new TestUserPrincipal("test-runningscript");
             }
             else
             {

diff --git a/source/Octopus.Tentacle.Tests.Integration/Util/SilentProcessRunnerFixture.cs b/source/Octopus.Tentacle.Tests.Integration/Util/SilentProcessRunnerFixture.cs
@@ -14,7 +14,6 @@ public class SilentProcessRunnerFixture : IntegrationTest
     {
         const int SIG_TERM = 143;
         const int SIG_KILL = 137;
-        TestUserPrincipal user;
         string command;
         string commandParam;
 
@@ -23,7 +22,6 @@ public void SetUpLocal()
         {
             if (PlatformDetection.IsRunningOnWindows)
             {
-                user = new TestUserPrincipal("test-silentprocess");
                 command = "cmd.exe";
                 commandParam = "/c";
             }