Skip to content

Fix flaky storage progress tests, bump AWSSDK.S3 to 4.0.103.4 #126

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
Menelion merged 1 commit into from
Sep 24, 2026
Merged

Fix flaky storage progress tests, bump AWSSDK.S3 to 4.0.103.4 #126

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/SharpSync/SharpSync.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<PackageReference Include="sqlite-net-pcl" Version="1.11.285" />
<PackageReference Include="WebDav.Client" Version="2.9.0" />
<PackageReference Include="SSH.NET" Version="2026.0.0" />
<PackageReference Include="AWSSDK.S3" Version="4.0.103.1" />
<PackageReference Include="AWSSDK.S3" Version="4.0.103.4" />
<PackageReference Include="FluentFTP" Version="55.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="5.9.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.401" PrivateAssets="all" />
Expand Down
9 changes: 5 additions & 4 deletions tests/SharpSync.Tests/Storage/FtpStorageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Concurrent;
using Microsoft.Extensions.Logging.Abstractions;
using Oire.SharpSync.Tests.Fixtures;

Expand Down Expand Up @@ -539,8 +540,8 @@ public async Task WriteFileAsync_LargeFile_SupportsProgressReporting() {
var content = new byte[15 * 1024 * 1024]; // 15MB (larger than default chunk size)
new Random().NextBytes(content);

var progressEvents = new List<StorageProgressEventArgs>();
_storage.ProgressChanged += (sender, args) => progressEvents.Add(args);
var progressEvents = new ConcurrentQueue<StorageProgressEventArgs>();
_storage.ProgressChanged += (sender, args) => progressEvents.Enqueue(args);

// Act
using var stream = new MemoryStream(content);
Expand All @@ -566,8 +567,8 @@ public async Task ReadFileAsync_LargeFile_SupportsProgressReporting() {
using var writeStream = new MemoryStream(content);
await _storage.WriteFileAsync(filePath, writeStream);

var progressEvents = new List<StorageProgressEventArgs>();
_storage.ProgressChanged += (sender, args) => progressEvents.Add(args);
var progressEvents = new ConcurrentQueue<StorageProgressEventArgs>();
_storage.ProgressChanged += (sender, args) => progressEvents.Enqueue(args);

// Act
using var readStream = await _storage.ReadFileAsync(filePath);
Expand Down
9 changes: 5 additions & 4 deletions tests/SharpSync.Tests/Storage/S3StorageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Concurrent;
using Microsoft.Extensions.Logging.Abstractions;
using Oire.SharpSync.Tests.Fixtures;

Expand Down Expand Up @@ -591,8 +592,8 @@ public async Task ProgressChanged_LargeFileUpload_RaisesEvents() {
var content = new byte[12 * 1024 * 1024];
new Random().NextBytes(content);

var progressEvents = new List<StorageProgressEventArgs>();
_storage.ProgressChanged += (sender, args) => progressEvents.Add(args);
var progressEvents = new ConcurrentQueue<StorageProgressEventArgs>();
_storage.ProgressChanged += (sender, args) => progressEvents.Enqueue(args);

// Act
using var stream = new MemoryStream(content);
Expand Down Expand Up @@ -624,8 +625,8 @@ public async Task ProgressChanged_LargeFileDownload_RaisesEvents() {
using var stream = new MemoryStream(content);
await _storage.WriteFileAsync(filePath, stream);

var progressEvents = new List<StorageProgressEventArgs>();
_storage.ProgressChanged += (sender, args) => progressEvents.Add(args);
var progressEvents = new ConcurrentQueue<StorageProgressEventArgs>();
_storage.ProgressChanged += (sender, args) => progressEvents.Enqueue(args);

// Act
using var readStream = await _storage.ReadFileAsync(filePath);
Expand Down
5 changes: 3 additions & 2 deletions tests/SharpSync.Tests/Storage/SftpStorageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Collections.Concurrent;
using Microsoft.Extensions.Logging.Abstractions;
using Oire.SharpSync.Tests.Fixtures;

Expand Down Expand Up @@ -717,8 +718,8 @@ public async Task ProgressChanged_LargeFile_RaisesEvents() {
var largeContent = new byte[15 * 1024 * 1024]; // 15 MB (larger than chunk size)
new Random().NextBytes(largeContent);

var progressEvents = new List<StorageProgressEventArgs>();
_storage.ProgressChanged += (sender, args) => progressEvents.Add(args);
var progressEvents = new ConcurrentQueue<StorageProgressEventArgs>();
_storage.ProgressChanged += (sender, args) => progressEvents.Enqueue(args);

// Act
using var stream = new MemoryStream(largeContent);
Expand Down
Loading