don't run docker tests

dotnet · jkotalik · May 20, 2020 · Apr 30, 2020 · Apr 30, 2020 · Apr 30, 2020
commit 3f48f54edae5c34745493ddd6e35438b047e38f0
diff --git a/test/E2ETest/HealthCheckTests.cs b/test/E2ETest/HealthCheckTests.cs
@@ -53,18 +53,16 @@ public HealthCheckTests(ITestOutputHelper output)
             _options.Converters.Add(new JsonStringEnumConverter(JsonNamingPolicy.CamelCase));
         }
 
-        [Theory]
-        [InlineData(false)]
-        [InlineData(true)]
-        public async Task ServiceWithoutLivenessReadinessShouldDefaultToReadyTests(bool docker)
+        [Fact]
+        public async Task ServiceWithoutLivenessReadinessShouldDefaultToReadyTests()
         {
             using var projectDirectory = CopyTestProjectDirectory("health-checks");
 
             var projectFile = new FileInfo(Path.Combine(projectDirectory.DirectoryPath, "tye.yaml"));
             var outputContext = new OutputContext(_sink, Verbosity.Debug);
             var application = await ApplicationFactory.CreateAsync(outputContext, projectFile);
 
-            await using var host = new TyeHost(application.ToHostingApplication(), new HostOptions() { Docker = docker })
+            await using var host = new TyeHost(application.ToHostingApplication(), new HostOptions())
             {
                 Sink = _sink,
             };
@@ -73,18 +71,16 @@ public async Task ServiceWithoutLivenessReadinessShouldDefaultToReadyTests(bool
             await DoOperationAndWaitForReplicasToChangeState(host, ReplicaState.Ready, replicasToBeReady.Count, replicasToBeReady, null, TimeSpan.Zero, h => h.StartAsync());
         }
 
-        [Theory]
-        [InlineData(false)]
-        [InlineData(true)]
-        public async Task ServiceWithoutLivenessShouldDefaultToHealthyTests(bool docker)
+        [Fact]
+        public async Task ServiceWithoutLivenessShouldDefaultToHealthyTests()
         {
             using var projectDirectory = CopyTestProjectDirectory("health-checks");
 
             var projectFile = new FileInfo(Path.Combine(projectDirectory.DirectoryPath, "tye.yaml"));
             var outputContext = new OutputContext(_sink, Verbosity.Debug);
             var application = await ApplicationFactory.CreateAsync(outputContext, projectFile);
 
-            await using var host = new TyeHost(application.ToHostingApplication(), new HostOptions() { Docker = docker })
+            await using var host = new TyeHost(application.ToHostingApplication(), new HostOptions())
             {
                 Sink = _sink,
             };
@@ -93,18 +89,16 @@ public async Task ServiceWithoutLivenessShouldDefaultToHealthyTests(bool docker)
             await DoOperationAndWaitForReplicasToChangeState(host, ReplicaState.Healthy, replicasToBeHealthy.Count, replicasToBeHealthy, null, TimeSpan.Zero, h => h.StartAsync());
         }
 
-        [Theory]
-        [InlineData(false)]
-        [InlineData(true)]
-        public async Task ServiceWithoutReadinessShouldDefaultToReadyWhenHealthyTests(bool docker)
+        [Fact]
+        public async Task ServiceWithoutReadinessShouldDefaultToReadyWhenHealthyTests()
         {
             using var projectDirectory = CopyTestProjectDirectory("health-checks");
 
             var projectFile = new FileInfo(Path.Combine(projectDirectory.DirectoryPath, "tye.yaml"));
             var outputContext = new OutputContext(_sink, Verbosity.Debug);
             var application = await ApplicationFactory.CreateAsync(outputContext, projectFile);
 
-            await using var host = new TyeHost(application.ToHostingApplication(), new HostOptions() { Docker = docker })
+            await using var host = new TyeHost(application.ToHostingApplication(), new HostOptions())
             {
                 Sink = _sink,
             };

diff --git a/test/E2ETest/ReplicaStoppingTests.cs b/test/E2ETest/ReplicaStoppingTests.cs
@@ -44,34 +44,61 @@ public ReplicaStoppingTests(ITestOutputHelper output)
             _options.Converters.Add(new JsonStringEnumConverter(JsonNamingPolicy.CamelCase));
         }
 
-        [Theory]
-        [InlineData(false)]
-        [InlineData(true)]
-        public async Task MultiProjectStoppingTests(bool docker)
+        [Fact]
+        public async Task MultiProjectStoppingTests()
         {
             using var projectDirectory = CopyTestProjectDirectory("multi-project");
 
             var projectFile = new FileInfo(Path.Combine(projectDirectory.DirectoryPath, "tye.yaml"));
             var outputContext = new OutputContext(_sink, Verbosity.Debug);
             var application = await ApplicationFactory.CreateAsync(outputContext, projectFile);
 
-            await RunHostingApplication(application, new HostOptions() { Docker = docker }, async (host, uri) =>
-                 {
-                     var replicaToStop = host.Application.Services["frontend"].Replicas.First();
-                     Assert.Contains(replicaToStop.Value.State, startedOrHigher);
+            await RunHostingApplication(application, new HostOptions(), async (host, uri) =>
+            {
+                var replicaToStop = host.Application.Services["frontend"].Replicas.First();
+                Assert.Contains(replicaToStop.Value.State, startedOrHigher);
+
+                var replicasToRestart = new[] { replicaToStop.Key };
+                var restOfReplicas = host.Application.Services.SelectMany(s => s.Value.Replicas).Select(r => r.Value.Name).Where(r => r != replicaToStop.Key).ToArray();
+
+                Assert.True(await DoOperationAndWaitForReplicasToRestart(host, replicasToRestart.ToHashSet(), restOfReplicas.ToHashSet(), TimeSpan.FromSeconds(1), _ =>
+                {
+                    replicaToStop.Value.StoppingTokenSource.Cancel();
+                    return Task.CompletedTask;
+                }));
+
+                Assert.Contains(replicaToStop.Value.State, stoppedOrLower);
+                Assert.True(host.Application.Services.SelectMany(s => s.Value.Replicas).All(r => startedOrHigher.Contains(r.Value.State)));
+            });
+        }
+
+        [ConditionalFact]
+        [SkipIfDockerNotRunning]
+        public async Task MultiProjectDockerStoppingTests()
+        {
+            using var projectDirectory = CopyTestProjectDirectory("multi-project");
+
+            var projectFile = new FileInfo(Path.Combine(projectDirectory.DirectoryPath, "tye.yaml"));
+            var outputContext = new OutputContext(_sink, Verbosity.Debug);
+            var application = await ApplicationFactory.CreateAsync(outputContext, projectFile);
+
+            await RunHostingApplication(application, new HostOptions() { Docker = true }, async (host, uri) =>
+              {
+                  var replicaToStop = host.Application.Services["frontend"].Replicas.First();
+                  Assert.Contains(replicaToStop.Value.State, startedOrHigher);
 
-                     var replicasToRestart = new[] { replicaToStop.Key };
-                     var restOfReplicas = host.Application.Services.SelectMany(s => s.Value.Replicas).Select(r => r.Value.Name).Where(r => r != replicaToStop.Key).ToArray();
+                  var replicasToRestart = new[] { replicaToStop.Key };
+                  var restOfReplicas = host.Application.Services.SelectMany(s => s.Value.Replicas).Select(r => r.Value.Name).Where(r => r != replicaToStop.Key).ToArray();
 
-                     Assert.True(await DoOperationAndWaitForReplicasToRestart(host, replicasToRestart.ToHashSet(), restOfReplicas.ToHashSet(), TimeSpan.FromSeconds(1), _ =>
-                     {
-                         replicaToStop.Value.StoppingTokenSource.Cancel();
-                         return Task.CompletedTask;
-                     }));
+                  Assert.True(await DoOperationAndWaitForReplicasToRestart(host, replicasToRestart.ToHashSet(), restOfReplicas.ToHashSet(), TimeSpan.FromSeconds(1), _ =>
+                  {
+                      replicaToStop.Value.StoppingTokenSource.Cancel();
+                      return Task.CompletedTask;
+                  }));
 
-                     Assert.Contains(replicaToStop.Value.State, stoppedOrLower);
-                     Assert.True(host.Application.Services.SelectMany(s => s.Value.Replicas).All(r => startedOrHigher.Contains(r.Value.State)));
-                 });
+                  Assert.Contains(replicaToStop.Value.State, stoppedOrLower);
+                  Assert.True(host.Application.Services.SelectMany(s => s.Value.Replicas).All(r => startedOrHigher.Contains(r.Value.State)));
+              });
         }
 
         private async Task RunHostingApplication(ApplicationBuilder application, HostOptions options, Func<TyeHost, Uri, Task> execute)