Skip to content

Commit

Permalink
Revert "Dont trim line break characters from inputs (#3025)" (#3046)
Browse files Browse the repository at this point in the history
This reverts commit 5e79b33.

Co-authored-by: maroghel <maroghel@microsoft.com>
  • Loading branch information
mjroghelia and maroghel committed Jul 16, 2020
1 parent d8ce2f2 commit a615154
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 37 deletions.
4 changes: 2 additions & 2 deletions src/Agent.Worker/TaskRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public async Task RunAsync()
string key = input?.Name?.Trim() ?? string.Empty;
if (!string.IsNullOrEmpty(key))
{
inputs[key] = input.DefaultValue?.Trim(' ') ?? string.Empty;
inputs[key] = input.DefaultValue?.Trim() ?? string.Empty;
}
}

Expand All @@ -201,7 +201,7 @@ public async Task RunAsync()
string key = input.Key?.Trim() ?? string.Empty;
if (!string.IsNullOrEmpty(key))
{
inputs[key] = input.Value?.Trim(' ') ?? string.Empty;
inputs[key] = input.Value?.Trim() ?? string.Empty;
}
}

Expand Down
35 changes: 0 additions & 35 deletions src/Test/L1/Worker/WorkerL1Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -121,41 +121,6 @@ public async Task SetVariable_ReadVariable()
}
}

[Fact]
[Trait("Level", "L1")]
[Trait("Category", "Worker")]
public async Task Input_HandlesTrailingSpace()
{
try
{
// Arrange
SetupL1();
var message = LoadTemplateMessage();
// Remove all tasks
message.Steps.Clear();
// Add variable setting tasks
message.Steps.Add(CreateScriptTask("echo \\r\\n"));

// Act
var results = await RunWorker(message);

// Assert
AssertJobCompleted();
Assert.Equal(TaskResult.Succeeded, results.Result);

var steps = GetSteps();
Assert.Equal(3, steps.Count()); // Init, CmdLine, CmdLine, Finalize
var outputStep = steps[1];
var log = GetTimelineLogLines(outputStep);

Assert.True(log.Where(x => x.Contains("\\r\\n")).Count() > 0);
}
finally
{
TearDown();
}
}

[Fact]
[Trait("Level", "L1")]
[Trait("Category", "Worker")]
Expand Down

0 comments on commit a615154

Please sign in to comment.