Run console tests that insteract with instance configuration in seria…

…l to avoid conflicts (#718)
OctopusDeploy · Dec 3, 2023 · 3391b3d · 3391b3d
1 parent bb0e3c1
commit 3391b3d
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/source/Octopus.Tentacle.Tests.Integration/TentacleCommandLineTests.cs b/source/Octopus.Tentacle.Tests.Integration/TentacleCommandLineTests.cs
@@ -268,7 +268,6 @@ public async Task CommandSpecificHelpAsJsonLooksSensibleToHumans(TentacleConfigu
 
         [Test]
         [TentacleConfigurations(scriptServiceToTest: ScriptServiceVersionToTest.None)]
-        [NonParallelizable]
         public async Task HelpForInstanceSpecificCommandsAlwaysWorks(TentacleConfigurationTestCase tc)
         {
             var (_, stdout, stderr) = await RunCommand(tc, "help", "--format=json");
@@ -327,6 +326,8 @@ public async Task HelpForInstanceSpecificCommandsAlwaysWorks(TentacleConfigurati
 
         [Test]
         [TentacleConfigurations(scriptServiceToTest: ScriptServiceVersionToTest.None)]
+        // Run these tests in serial to avoid conflicts
+        [NonParallelizable]
         public async Task InvalidInstance(TentacleConfigurationTestCase tc)
         {
             var (exitCode, stdout, stderr) = await RunCommand(tc, "show-thumbprint", "--instance=invalidinstance");
@@ -339,6 +340,8 @@ public async Task InvalidInstance(TentacleConfigurationTestCase tc)
 
         [Test]
         [TentacleConfigurations(scriptServiceToTest: ScriptServiceVersionToTest.None)]
+        // Run these tests in serial to avoid conflicts
+        [NonParallelizable]
         public async Task ShowThumbprintCommandText(TentacleConfigurationTestCase tc)
         {
             await using var clientAndTentacle = await tc.CreateBuilder().Build(CancellationToken);
@@ -351,6 +354,8 @@ public async Task ShowThumbprintCommandText(TentacleConfigurationTestCase tc)
 
         [Test]
         [TentacleConfigurations(scriptServiceToTest: ScriptServiceVersionToTest.None)]
+        // Run these tests in serial to avoid conflicts
+        [NonParallelizable]
         public async Task ShowThumbprintCommandJson(TentacleConfigurationTestCase tc)
         {
             await using var clientAndTentacle = await tc.CreateBuilder().Build(CancellationToken);
@@ -363,6 +368,8 @@ public async Task ShowThumbprintCommandJson(TentacleConfigurationTestCase tc)
 
         [Test]
         [TentacleConfigurations(scriptServiceToTest: ScriptServiceVersionToTest.None)]
+        // Run these tests in serial to avoid conflicts
+        [NonParallelizable]
         public async Task ListInstancesCommandText(TentacleConfigurationTestCase tc)
         {
             await using var clientAndTentacle = await tc.CreateBuilder().Build(CancellationToken);
@@ -376,6 +383,8 @@ public async Task ListInstancesCommandText(TentacleConfigurationTestCase tc)
 
         [Test]
         [TentacleConfigurations(scriptServiceToTest: ScriptServiceVersionToTest.None)]
+        // Run these tests in serial to avoid conflicts
+        [NonParallelizable]
         public async Task ListInstancesCommandJson(TentacleConfigurationTestCase tc)
         {
             await using var clientAndTentacle = await tc.CreateBuilder().Build(CancellationToken);
@@ -390,6 +399,7 @@ public async Task ListInstancesCommandJson(TentacleConfigurationTestCase tc)
 
         [Test]
         [TentacleConfigurations(scriptServiceToTest: ScriptServiceVersionToTest.None)]
+        // Run these tests in serial to avoid conflicts
         [NonParallelizable]
         public async Task ShouldLogStartupDiagnosticsToInstanceLogFileOnly(TentacleConfigurationTestCase tc)
         {
@@ -479,6 +489,7 @@ to text.
 
         [Test]
         [TentacleConfigurations(scriptServiceToTest: ScriptServiceVersionToTest.None)]
+        // Run these tests in serial to avoid conflicts
         [NonParallelizable]
         public async Task ShowConfigurationCommand(TentacleConfigurationTestCase tc)
         {
@@ -495,6 +506,7 @@ public async Task ShowConfigurationCommand(TentacleConfigurationTestCase tc)
 
         [Test]
         [TentacleConfigurations(scriptServiceToTest: ScriptServiceVersionToTest.None)]
+        // Run these tests in serial to avoid conflicts
         [NonParallelizable]
         public async Task ShowConfigurationCommandOnPartiallyConfiguredTentacle(TentacleConfigurationTestCase tc)
         {
@@ -511,6 +523,7 @@ public async Task ShowConfigurationCommandOnPartiallyConfiguredTentacle(Tentacle
 
         [Test]
         [TentacleConfigurations(scriptServiceToTest: ScriptServiceVersionToTest.None)]
+        // Run these tests in serial to avoid conflicts
         [NonParallelizable]
         public async Task ShowConfigurationCommandLooksSensibleToHumans(TentacleConfigurationTestCase tc)
         {
@@ -603,6 +616,7 @@ public async Task ShowConfigurationCommandLooksSensibleToHumans(TentacleConfigur
         [Test]
         [TentacleConfigurations(scriptServiceToTest: ScriptServiceVersionToTest.None)]
         [WindowsTest]
+        // Run these tests in serial to avoid conflicts
         [NonParallelizable]
         public async Task WatchdogCreateAndDeleteCommand(TentacleConfigurationTestCase tc)
         {