Skip to content

OpenAPI Flaky fix #20383

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
merged 2 commits into from
Apr 1, 2020
Merged

OpenAPI Flaky fix #20383

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
dfbb2bc
Don't use network unless we have to
ryanbrandenburg Mar 31, 2020
efef29a
update tests
ryanbrandenburg Apr 1, 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
2 changes: 1 addition & 1 deletion src/Tools/Microsoft.dotnet-openapi/test/OpenApiAddURLTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ public async Task OpenAPi_Add_URL_InvalidUrl()
{
var project = CreateBasicProject(withOpenApi: false);

var app = GetApplication(realHttp: true);
var app = GetApplication();
var url = BrokenUrl;
var run = app.Execute(new[] { "add", "url", url });

Expand Down
29 changes: 24 additions & 5 deletions src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ private IDictionary<string, Tuple<string, ContentDispositionHeaderValue>> Downlo
{ PackageUrl, Tuple.Create<string, ContentDispositionHeaderValue>(PackageUrlContent, null) },
{ NoDispositionUrl, Tuple.Create<string, ContentDispositionHeaderValue>(Content, null) },
{ NoExtensionUrl, Tuple.Create(Content, noExtension) },
{ NoSegmentUrl, Tuple.Create(Content, justAttachments) }
{ NoSegmentUrl, Tuple.Create(Content, justAttachments) },
{ BrokenUrl, null }
};
}

Expand Down Expand Up @@ -139,10 +140,14 @@ public void Dispose()
public Task<IHttpResponseMessageWrapper> GetResponseAsync(string url)
{
var result = _results[url];
byte[] byteArray = Encoding.ASCII.GetBytes(result.Item1);
var stream = new MemoryStream(byteArray);
MemoryStream stream = null;
if(result != null)
{
byte[] byteArray = Encoding.ASCII.GetBytes(result.Item1);
stream = new MemoryStream(byteArray);
}

return Task.FromResult<IHttpResponseMessageWrapper>(new TestHttpResponseMessageWrapper(stream, result.Item2));
return Task.FromResult<IHttpResponseMessageWrapper>(new TestHttpResponseMessageWrapper(stream, result?.Item2));
}
}

Expand All @@ -154,7 +159,17 @@ public class TestHttpResponseMessageWrapper : IHttpResponseMessageWrapper

public bool IsSuccessCode()
{
return true;
switch(StatusCode)
{
case HttpStatusCode.OK:
case HttpStatusCode.Created:
case HttpStatusCode.NoContent:
case HttpStatusCode.Accepted:
return true;
case HttpStatusCode.NotFound:
default:
return false;
}
}

private readonly ContentDispositionHeaderValue _contentDisposition;
Expand All @@ -164,6 +179,10 @@ public TestHttpResponseMessageWrapper(
ContentDispositionHeaderValue header)
{
Stream = Task.FromResult<Stream>(stream);
if (header is null && stream is null)
{
StatusCode = HttpStatusCode.NotFound;
}
_contentDisposition = header;
}

Expand Down