Skip to content
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

Fix HTTP 500 on storage conflict #5879

Merged
merged 1 commit into from
May 3, 2018
Merged

Fix HTTP 500 on storage conflict #5879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/NuGetGallery/Services/PackageUploadService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ await _packageFileService.DeleteValidationPackageFileAsync(
await _packageFileService.SavePackageFileAsync(package, packageFile);
}
}
catch (InvalidOperationException ex)
catch (FileAlreadyExistsException ex)
{
ex.Log();
return PackageCommitResult.Conflict;
Expand Down
6 changes: 3 additions & 3 deletions tests/NuGetGallery.Facts/Services/PackageUploadServiceFacts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ public async Task DoesNotCommitToDatabaseWhenThePackageFileConflicts()
}

[Fact]
public async Task DoesNotCommitToDatabaseWhenThValidationFileConflicts()
public async Task DoesNotCommitToDatabaseWhenTheValidationFileConflicts()
{
_package.PackageStatusKey = PackageStatus.Validating;

Expand Down Expand Up @@ -444,7 +444,7 @@ public abstract class FactsBase
protected Package _package;
protected Stream _packageFile;
protected ArgumentException _unexpectedException;
protected InvalidOperationException _conflictException;
protected FileAlreadyExistsException _conflictException;
protected readonly PackageUploadService _target;

public FactsBase()
Expand All @@ -465,7 +465,7 @@ public FactsBase()
};
_packageFile = Stream.Null;
_unexpectedException = new ArgumentException("Fail!");
_conflictException = new InvalidOperationException("Conflict!");
_conflictException = new FileAlreadyExistsException("Conflict!");

_target = new PackageUploadService(
_packageService.Object,
Expand Down