Skip to content

Fix flaky E2E durable tests #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AnatoliB merged 2 commits into from
Sep 1, 2020
Merged

Fix flaky E2E durable tests #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9185d23
Pass log content instead of file name: DurableTimerClient
AnatoliB Aug 31, 2020
5d0dd4f
Pass log content instead of file name: CurrentUtcDateTimeClient
AnatoliB Aug 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 4 additions & 26 deletions ...nctions.PowerShellWorker.E2E/Azure.Functions.PowerShellWorker.E2E/DurableEndToEndTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,19 +147,8 @@ public async Task CurrentUtcDateTimeClientReplaysCurrentUtcDateTime()
{
var statusResponseBody = await GetResponseBodyAsync(statusResponse);
Assert.Equal("Completed", (string)statusResponseBody.runtimeStatus);
string path = statusResponseBody.output.ToString();
string lastFolderName = Path.GetDirectoryName(path);

if (!Directory.Exists(lastFolderName))
{
Assert.True(false, $@"The directory {lastFolderName} does not exist!
The system's value for TMP is {System.Environment.GetEnvironmentVariable("TMP", EnvironmentVariableTarget.Machine)}.
The user's value for TMP is {System.Environment.GetEnvironmentVariable("TMP")}.
The system's value for TEMP is {System.Environment.GetEnvironmentVariable("TEMP", EnvironmentVariableTarget.Machine)}.
The user's value for TEMP is {System.Environment.GetEnvironmentVariable("TEMP")}");
}

string[] lines = System.IO.File.ReadAllLines(path);
string log = statusResponseBody.output.ToString();
string[] lines = log.Split('\n');

// Expect the format to be as in Case 1
var delineatorLines = new int[] { 0, 3, 9 };
Expand Down Expand Up @@ -239,19 +228,8 @@ private async Task DurableTimerClientStopsOrchestratorAndUpdatesCurrentUtcDateTi
{
var statusResponseBody = await GetResponseBodyAsync(statusResponse);
Assert.Equal("Completed", (string)statusResponseBody.runtimeStatus);
string path = statusResponseBody.output.ToString();
string lastFolderName = Path.GetDirectoryName(path);

if (!Directory.Exists(lastFolderName))
{
Assert.True(false, $@"The directory {lastFolderName} does not exist!
The system's value for TMP is {System.Environment.GetEnvironmentVariable("TMP", EnvironmentVariableTarget.Machine)}.
The user's value for TMP is {System.Environment.GetEnvironmentVariable("TMP")}.
The system's value for TEMP is {System.Environment.GetEnvironmentVariable("TEMP", EnvironmentVariableTarget.Machine)}.
The user's value for TEMP is {System.Environment.GetEnvironmentVariable("TEMP")}");
}

string[] lines = System.IO.File.ReadAllLines(path);
string log = statusResponseBody.output.ToString();
string[] lines = log.Split('\n');

// Expect the format to be as in Case 1
var delineatorLines = new int[] { 0, 2 };
Expand Down
2 changes: 1 addition & 1 deletion test/E2E/TestFunctionApp/CurrentUtcDateTimeOrchestrator/run.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Add-Content -Value $Context.CurrentUtcDateTime -Path $path

Write-Host "CurrentUtcDateTimeOrchestrator: finished."

return $path
return (Get-Content $path) -join "`n"

<#
Contents of the file should resemble one of the following two cases:
Expand Down
2 changes: 1 addition & 1 deletion test/E2E/TestFunctionApp/DurableTimerOrchestrator/run.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Add-Content -Value $Context.CurrentUtcDateTime -Path $path

Write-Host "DurableTimerOrchestrator: finished."

return $path
return (Get-Content $path) -join "`n"

<#
Contents of the file should resemble the following:
Expand Down