diff --git a/src/Runner.Worker/Container/DockerCommandManager.cs b/src/Runner.Worker/Container/DockerCommandManager.cs index 265cafc75..c7b3ada12 100644 --- a/src/Runner.Worker/Container/DockerCommandManager.cs +++ b/src/Runner.Worker/Container/DockerCommandManager.cs @@ -32,7 +32,6 @@ namespace GitHub.Runner.Worker.Container Task DockerExec(IExecutionContext context, string containerId, string options, string command); Task DockerExec(IExecutionContext context, string containerId, string options, string command, List outputs); Task> DockerInspect(IExecutionContext context, string dockerObject, string options); - Task> DockerInspectLogs(IExecutionContext context, string dockerContainerId); Task> DockerPort(IExecutionContext context, string containerId); Task DockerLogin(IExecutionContext context, string configFileDirectory, string registry, string username, string password); } @@ -352,11 +351,7 @@ namespace GitHub.Runner.Worker.Container { return await ExecuteDockerCommandAsync(context, "inspect", $"{options} {dockerObject}"); } - - public async Task> DockerInspectLogs(IExecutionContext context, string dockerContainerId) - { - return await ExecuteDockerCommandAsync(context, "logs", $"{dockerContainerId}"); - } + public async Task> DockerPort(IExecutionContext context, string containerId) { diff --git a/src/Runner.Worker/ContainerOperationProvider.cs b/src/Runner.Worker/ContainerOperationProvider.cs index ea065116e..61b40b7a7 100644 --- a/src/Runner.Worker/ContainerOperationProvider.cs +++ b/src/Runner.Worker/ContainerOperationProvider.cs @@ -430,7 +430,7 @@ namespace GitHub.Runner.Worker else { executionContext.Output($"##[group] Container {container.ContainerImage} failed healthchecks, printing logs:"); - await _dockerManager.DockerInspectLogs(context: executionContext, dockerContainerId: container.ContainerId); + await _dockerManager.DockerLogs(context: executionContext, containerId: container.ContainerId); executionContext.Output("##[endgroup]"); } } diff --git a/src/Test/L0/Worker/ContainerOperationProviderL0.cs b/src/Test/L0/Worker/ContainerOperationProviderL0.cs index 98a5db1ae..56a6f5e54 100644 --- a/src/Test/L0/Worker/ContainerOperationProviderL0.cs +++ b/src/Test/L0/Worker/ContainerOperationProviderL0.cs @@ -47,48 +47,25 @@ namespace GitHub.Runner.Common.Tests.Worker var result = await containerOperationProvider.Healthcheck(_ec.Object, containerInfo); //Assert - _dockerManager.Verify(dm => dm.DockerInspectLogs(It.IsAny(), It.IsAny()), Times.Never()); + _dockerManager.Verify(dm => dm.DockerLogs(It.IsAny(), It.IsAny()), Times.Never()); } [Fact] [Trait("Level", "L0")] [Trait("Category", "Worker")] - public async void Healthchecktest_dockerError() + public async void HealthcheckTestDockerErrorLogs() { //Arrange Setup(); - _dockerManager.Setup(x => x.DockerInspectLogs(_ec.Object, containerInfo.ContainerId)).Returns(Task.FromResult(dockerLogs)); - + _dockerManager.Setup(x => x.DockerLogs(_ec.Object, containerInfo.ContainerId)).Returns(Task.FromResult(1)); //Act - //Asert - await Assert.ThrowsAsync(() => containerOperationProvider.ContainerHealthcheckLogs(_ec.Object, containerInfo, "error")); - - } - - [Fact] - [Trait("Level", "L0")] - [Trait("Category", "Worker")] - public async void Healthchecktest_dockerError_inspectLogs() - { - //Arrange - Setup(); - _dockerManager.Setup(x => x.DockerInspectLogs(_ec.Object, containerInfo.ContainerId)).Returns(Task.FromResult(dockerLogs)); - - try - { - //Act - await containerOperationProvider.ContainerHealthcheckLogs(_ec.Object, containerInfo, "error"); - - } - catch (InvalidOperationException) - { - - //Assert - _ec.Verify(pL => pL.Write(It.IsAny(), It.IsAny()), Times.Exactly(3)); - - } + await containerOperationProvider.ContainerHealthcheckLogs(_ec.Object, containerInfo, "error"); + //Assert + _ec.Verify(dm => dm.Write(It.IsAny(), It.IsAny()), Times.Exactly(2)); + _ec.Verify(dm => dm.Write(null, $"##[group] Container {containerInfo.ContainerImage} failed healthchecks, printing logs:"), Times.AtLeastOnce()); + _ec.Verify(dm => dm.Write(null, "##[endgroup]"), Times.AtLeastOnce()); } private void Setup([CallerMemberName] string testName = "") @@ -110,9 +87,6 @@ namespace GitHub.Runner.Common.Tests.Worker _hc.SetSingleton(_dockerManager.Object); _hc.SetSingleton(_containerHookManager.Object); - var list = new List(); - list.Add("result"); - _ec.Setup(x => x.Global).Returns(new GlobalContext()); containerOperationProvider.Initialize(_hc);