From ac1a076a3b63c4f276c4fb28756fcca14305822e Mon Sep 17 00:00:00 2001 From: Joseph Petersen Date: Sat, 21 Dec 2019 15:51:41 +0100 Subject: [PATCH] Treat warnings as errors (#249) * Treat warnings as errors * fix warnings --- src/Directory.Build.props | 5 ++ src/Test/L0/ProcessInvokerL0.cs | 8 +-- src/Test/L0/Worker/ActionManagerL0.cs | 88 +++++++++++++-------------- 3 files changed, 53 insertions(+), 48 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 5c4a93183..71e570e08 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -46,4 +46,9 @@ $(DefineConstants);DEBUG + + + + true + diff --git a/src/Test/L0/ProcessInvokerL0.cs b/src/Test/L0/ProcessInvokerL0.cs index accf01a07..0679349ce 100644 --- a/src/Test/L0/ProcessInvokerL0.cs +++ b/src/Test/L0/ProcessInvokerL0.cs @@ -260,7 +260,7 @@ namespace GitHub.Runner.Common.Tests var proc = await processInvoker.ExecuteAsync("", "bash", "-c \"cat /proc/$$/oom_score_adj\"", null, false, null, false, null, false, false, highPriorityProcess: false, cancellationToken: tokenSource.Token); - Assert.Equal(oomScoreAdj, 500); + Assert.Equal(500, oomScoreAdj); } catch (OperationCanceledException) { @@ -293,12 +293,12 @@ namespace GitHub.Runner.Common.Tests }; try { - var proc = await processInvoker.ExecuteAsync("", "bash", "-c \"cat /proc/$$/oom_score_adj\"", + var proc = await processInvoker.ExecuteAsync("", "bash", "-c \"cat /proc/$$/oom_score_adj\"", new Dictionary { {"PIPELINE_JOB_OOMSCOREADJ", "1234"} }, false, null, false, null, false, false, highPriorityProcess: false, cancellationToken: tokenSource.Token); - Assert.Equal(oomScoreAdj, 1234); + Assert.Equal(1234, oomScoreAdj); } catch (OperationCanceledException) { @@ -336,7 +336,7 @@ namespace GitHub.Runner.Common.Tests var proc = await processInvoker.ExecuteAsync("", "bash", "-c \"cat /proc/$$/oom_score_adj\"", null, false, null, false, null, false, false, highPriorityProcess: true, cancellationToken: tokenSource.Token); - Assert.Equal(oomScoreAdj, 123); + Assert.Equal(123, oomScoreAdj); } catch (OperationCanceledException) { diff --git a/src/Test/L0/Worker/ActionManagerL0.cs b/src/Test/L0/Worker/ActionManagerL0.cs index 38bc0494c..ed3f1b065 100644 --- a/src/Test/L0/Worker/ActionManagerL0.cs +++ b/src/Test/L0/Worker/ActionManagerL0.cs @@ -57,8 +57,8 @@ namespace GitHub.Runner.Common.Tests.Worker var steps = await _actionManager.PrepareActionsAsync(_ec.Object, actions); //Assert - Assert.Equal((steps[0].Data as ContainerSetupInfo).StepIds[0], actionId); - Assert.Equal((steps[0].Data as ContainerSetupInfo).Container.Image, "ubuntu:16.04"); + Assert.Equal(actionId, (steps[0].Data as ContainerSetupInfo).StepIds[0]); + Assert.Equal("ubuntu:16.04", (steps[0].Data as ContainerSetupInfo).Container.Image); } finally { @@ -204,9 +204,9 @@ namespace GitHub.Runner.Common.Tests.Worker //Act var steps = await _actionManager.PrepareActionsAsync(_ec.Object, actions); - Assert.Equal((steps[0].Data as ContainerSetupInfo).StepIds[0], actionId); - Assert.Equal((steps[0].Data as ContainerSetupInfo).Container.WorkingDirectory, actionDir); - Assert.Equal((steps[0].Data as ContainerSetupInfo).Container.Dockerfile, Path.Combine(actionDir, "Dockerfile")); + Assert.Equal(actionId, (steps[0].Data as ContainerSetupInfo).StepIds[0]); + Assert.Equal(actionDir, (steps[0].Data as ContainerSetupInfo).Container.WorkingDirectory); + Assert.Equal(Path.Combine(actionDir, "Dockerfile"), (steps[0].Data as ContainerSetupInfo).Container.Dockerfile); } finally { @@ -245,9 +245,9 @@ namespace GitHub.Runner.Common.Tests.Worker //Act var steps = await _actionManager.PrepareActionsAsync(_ec.Object, actions); - Assert.Equal((steps[0].Data as ContainerSetupInfo).StepIds[0], actionId); - Assert.Equal((steps[0].Data as ContainerSetupInfo).Container.WorkingDirectory, actionDir); - Assert.Equal((steps[0].Data as ContainerSetupInfo).Container.Dockerfile, Path.Combine(actionDir, "images/cli", "Dockerfile")); + Assert.Equal(actionId, (steps[0].Data as ContainerSetupInfo).StepIds[0]); + Assert.Equal(actionDir, (steps[0].Data as ContainerSetupInfo).Container.WorkingDirectory); + Assert.Equal(Path.Combine(actionDir, "images/cli", "Dockerfile"), (steps[0].Data as ContainerSetupInfo).Container.Dockerfile); } finally { @@ -284,9 +284,9 @@ namespace GitHub.Runner.Common.Tests.Worker //Act var steps = await _actionManager.PrepareActionsAsync(_ec.Object, actions); - Assert.Equal((steps[0].Data as ContainerSetupInfo).StepIds[0], actionId); - Assert.Equal((steps[0].Data as ContainerSetupInfo).Container.WorkingDirectory, actionDir); - Assert.Equal((steps[0].Data as ContainerSetupInfo).Container.Dockerfile, Path.Combine(actionDir, "Dockerfile")); + Assert.Equal(actionId, (steps[0].Data as ContainerSetupInfo).StepIds[0]); + Assert.Equal(actionDir, (steps[0].Data as ContainerSetupInfo).Container.WorkingDirectory); + Assert.Equal(Path.Combine(actionDir, "Dockerfile"), (steps[0].Data as ContainerSetupInfo).Container.Dockerfile); } finally { @@ -324,9 +324,9 @@ namespace GitHub.Runner.Common.Tests.Worker //Act var steps = await _actionManager.PrepareActionsAsync(_ec.Object, actions); - Assert.Equal((steps[0].Data as ContainerSetupInfo).StepIds[0], actionId); - Assert.Equal((steps[0].Data as ContainerSetupInfo).Container.WorkingDirectory, actionDir); - Assert.Equal((steps[0].Data as ContainerSetupInfo).Container.Dockerfile, Path.Combine(actionDir, "images/Dockerfile")); + Assert.Equal(actionId, (steps[0].Data as ContainerSetupInfo).StepIds[0]); + Assert.Equal(actionDir, (steps[0].Data as ContainerSetupInfo).Container.WorkingDirectory); + Assert.Equal(Path.Combine(actionDir, "images/Dockerfile"), (steps[0].Data as ContainerSetupInfo).Container.Dockerfile); } finally { @@ -364,8 +364,8 @@ namespace GitHub.Runner.Common.Tests.Worker //Act var steps = await _actionManager.PrepareActionsAsync(_ec.Object, actions); - Assert.Equal((steps[0].Data as ContainerSetupInfo).StepIds[0], actionId); - Assert.Equal((steps[0].Data as ContainerSetupInfo).Container.Image, "ubuntu:18.04"); + Assert.Equal(actionId, (steps[0].Data as ContainerSetupInfo).StepIds[0]); + Assert.Equal("ubuntu:18.04", (steps[0].Data as ContainerSetupInfo).Container.Image); } finally { @@ -403,9 +403,9 @@ namespace GitHub.Runner.Common.Tests.Worker //Act var steps = await _actionManager.PrepareActionsAsync(_ec.Object, actions); - Assert.Equal((steps[0].Data as ContainerSetupInfo).StepIds[0], actionId); - Assert.Equal((steps[0].Data as ContainerSetupInfo).Container.WorkingDirectory, actionDir); - Assert.Equal((steps[0].Data as ContainerSetupInfo).Container.Dockerfile, Path.Combine(actionDir, "Dockerfile")); + Assert.Equal(actionId, (steps[0].Data as ContainerSetupInfo).StepIds[0]); + Assert.Equal(actionDir, (steps[0].Data as ContainerSetupInfo).Container.WorkingDirectory); + Assert.Equal(Path.Combine(actionDir, "Dockerfile"), (steps[0].Data as ContainerSetupInfo).Container.Dockerfile); } finally { @@ -521,30 +521,30 @@ namespace GitHub.Runner.Common.Tests.Worker var steps = await _actionManager.PrepareActionsAsync(_ec.Object, actions); //Assert - Assert.Equal((steps[0].Data as ContainerSetupInfo).StepIds[0], actionId1); - Assert.Equal((steps[0].Data as ContainerSetupInfo).Container.Image, "ubuntu:16.04"); + Assert.Equal(actionId1, (steps[0].Data as ContainerSetupInfo).StepIds[0]); + Assert.Equal("ubuntu:16.04", (steps[0].Data as ContainerSetupInfo).Container.Image); - Assert.True((steps[1].Data as ContainerSetupInfo).StepIds.Contains(actionId2)); - Assert.True((steps[1].Data as ContainerSetupInfo).StepIds.Contains(actionId3)); - Assert.True((steps[1].Data as ContainerSetupInfo).StepIds.Contains(actionId4)); - Assert.Equal((steps[1].Data as ContainerSetupInfo).Container.Image, "ubuntu:18.04"); + Assert.Contains(actionId2, (steps[1].Data as ContainerSetupInfo).StepIds); + Assert.Contains(actionId3, (steps[1].Data as ContainerSetupInfo).StepIds); + Assert.Contains(actionId4, (steps[1].Data as ContainerSetupInfo).StepIds); + Assert.Equal("ubuntu:18.04", (steps[1].Data as ContainerSetupInfo).Container.Image); var actionDir = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "TingluoHuang", "runner_L0", "repositoryactionwithdockerfile"); - Assert.Equal((steps[2].Data as ContainerSetupInfo).StepIds[0], actionId5); - Assert.Equal((steps[2].Data as ContainerSetupInfo).Container.WorkingDirectory, actionDir); - Assert.Equal((steps[2].Data as ContainerSetupInfo).Container.Dockerfile, Path.Combine(actionDir, "Dockerfile")); + Assert.Equal(actionId5, (steps[2].Data as ContainerSetupInfo).StepIds[0]); + Assert.Equal(actionDir, (steps[2].Data as ContainerSetupInfo).Container.WorkingDirectory); + Assert.Equal(Path.Combine(actionDir, "Dockerfile"), (steps[2].Data as ContainerSetupInfo).Container.Dockerfile); actionDir = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), "TingluoHuang", "runner_L0", "repositoryactionwithdockerfileinrelativepath"); - Assert.True((steps[3].Data as ContainerSetupInfo).StepIds.Contains(actionId6)); - Assert.True((steps[3].Data as ContainerSetupInfo).StepIds.Contains(actionId7)); - Assert.Equal((steps[3].Data as ContainerSetupInfo).Container.WorkingDirectory, actionDir); - Assert.Equal((steps[3].Data as ContainerSetupInfo).Container.Dockerfile, Path.Combine(actionDir, "Dockerfile")); + Assert.Contains(actionId6, (steps[3].Data as ContainerSetupInfo).StepIds); + Assert.Contains(actionId7, (steps[3].Data as ContainerSetupInfo).StepIds); + Assert.Equal(actionDir, (steps[3].Data as ContainerSetupInfo).Container.WorkingDirectory); + Assert.Equal(Path.Combine(actionDir, "Dockerfile"), (steps[3].Data as ContainerSetupInfo).Container.Dockerfile); - Assert.Equal((steps[4].Data as ContainerSetupInfo).StepIds[0], actionId8); - Assert.Equal((steps[4].Data as ContainerSetupInfo).Container.WorkingDirectory, actionDir); - Assert.Equal((steps[4].Data as ContainerSetupInfo).Container.Dockerfile, Path.Combine(actionDir, "images/cli", "Dockerfile")); + Assert.Equal(actionId8, (steps[4].Data as ContainerSetupInfo).StepIds[0]); + Assert.Equal(actionDir, (steps[4].Data as ContainerSetupInfo).Container.WorkingDirectory); + Assert.Equal(Path.Combine(actionDir, "images/cli", "Dockerfile"), (steps[4].Data as ContainerSetupInfo).Container.Dockerfile); } finally { @@ -672,7 +672,7 @@ namespace GitHub.Runner.Common.Tests.Worker name: 'Hello World' description: 'Greet the world and record the time' author: 'GitHub' -inputs: +inputs: greeting: # id of input description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout' required: true @@ -772,7 +772,7 @@ runs: name: 'Hello World' description: 'Greet the world and record the time' author: 'GitHub' -inputs: +inputs: greeting: # id of input description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout' required: true @@ -871,7 +871,7 @@ runs: name: 'Hello World' description: 'Greet the world and record the time' author: 'GitHub' -inputs: +inputs: greeting: # id of input description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout' required: true @@ -940,7 +940,7 @@ runs: name: 'Hello World' description: 'Greet the world and record the time' author: 'GitHub' -inputs: +inputs: greeting: # id of input description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout' required: true @@ -1039,7 +1039,7 @@ runs: name: 'Hello World' description: 'Greet the world and record the time' author: 'GitHub' -inputs: +inputs: greeting: # id of input description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout' required: true @@ -1137,7 +1137,7 @@ runs: name: 'Hello World' description: 'Greet the world and record the time' author: 'GitHub' -inputs: +inputs: greeting: # id of input description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout' required: true @@ -1205,7 +1205,7 @@ runs: name: 'Hello World' description: 'Greet the world and record the time' author: 'GitHub' -inputs: +inputs: greeting: # id of input description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout' required: true @@ -1276,7 +1276,7 @@ runs: name: 'Hello World' description: 'Greet the world and record the time' author: 'GitHub' -inputs: +inputs: greeting: # id of input description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout' required: true @@ -1376,7 +1376,7 @@ runs: name: 'Hello World' description: 'Greet the world and record the time' author: 'Test Corporation' -inputs: +inputs: greeting: # id of input description: 'The greeting we choose - will print ""{greeting}, World!"" on stdout' required: true