Skip to content

Commit 0c176ac

Browse files
Try using a different port
1 parent 1a71bcf commit 0c176ac

File tree

4 files changed

+28
-32
lines changed

4 files changed

+28
-32
lines changed

.github/workflows/build-and-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,14 @@ jobs:
102102
shell: bash
103103
run: |
104104
sudo npm install -g s3rver
105-
sudo s3rver -d . &
105+
sudo s3rver -p 10003 -d . &
106106
107107
- name: S3rver Setup Windows
108108
if: matrix.options.os == 'windows-latest'
109109
shell: bash
110110
run: |
111111
npm install -g s3rver
112-
s3rver -d . &
112+
s3rver -p 10003 -d . &
113113
114114
- name: DotNet Setup
115115
uses: actions/setup-dotnet@v3

tests/ImageSharp.Web.Tests/TestUtilities/AWSS3StorageCacheTestServerFixture.cs

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,29 @@ namespace SixLabors.ImageSharp.Web.Tests.TestUtilities;
1212
public class AWSS3StorageCacheTestServerFixture : TestServerFixture
1313
{
1414
protected override void ConfigureCustomServices(IServiceCollection services, IImageSharpBuilder builder)
15-
{
16-
return;
17-
18-
builder
19-
.Configure<AWSS3StorageImageProviderOptions>(o =>
20-
o.S3Buckets.Add(
21-
new AWSS3BucketClientOptions
22-
{
23-
Endpoint = TestConstants.AWSEndpoint,
24-
BucketName = TestConstants.AWSBucketName,
25-
AccessKey = TestConstants.AWSAccessKey,
26-
AccessSecret = TestConstants.AWSAccessSecret,
27-
Region = TestConstants.AWSRegion,
28-
Timeout = TestConstants.AWSTimeout,
29-
}))
30-
.AddProvider(AWSS3StorageImageProviderFactory.Create)
31-
.Configure<AWSS3StorageCacheOptions>(o =>
15+
=> builder
16+
.Configure<AWSS3StorageImageProviderOptions>(o =>
17+
o.S3Buckets.Add(
18+
new AWSS3BucketClientOptions
3219
{
33-
o.Endpoint = TestConstants.AWSEndpoint;
34-
o.BucketName = TestConstants.AWSCacheBucketName;
35-
o.AccessKey = TestConstants.AWSAccessKey;
36-
o.AccessSecret = TestConstants.AWSAccessSecret;
37-
o.Region = TestConstants.AWSRegion;
38-
o.Timeout = TestConstants.AWSTimeout;
20+
Endpoint = TestConstants.AWSEndpoint,
21+
BucketName = TestConstants.AWSBucketName,
22+
AccessKey = TestConstants.AWSAccessKey,
23+
AccessSecret = TestConstants.AWSAccessSecret,
24+
Region = TestConstants.AWSRegion,
25+
Timeout = TestConstants.AWSTimeout,
26+
}))
27+
.AddProvider(AWSS3StorageImageProviderFactory.Create)
28+
.Configure<AWSS3StorageCacheOptions>(o =>
29+
{
30+
o.Endpoint = TestConstants.AWSEndpoint;
31+
o.BucketName = TestConstants.AWSCacheBucketName;
32+
o.AccessKey = TestConstants.AWSAccessKey;
33+
o.AccessSecret = TestConstants.AWSAccessSecret;
34+
o.Region = TestConstants.AWSRegion;
35+
o.Timeout = TestConstants.AWSTimeout;
3936

40-
AWSS3StorageCache.CreateIfNotExists(o, S3CannedACL.Private);
41-
})
42-
.SetCache<AWSS3StorageCache>();
43-
}
37+
AWSS3StorageCache.CreateIfNotExists(o, S3CannedACL.Private);
38+
})
39+
.SetCache<AWSS3StorageCache>();
4440
}

tests/ImageSharp.Web.Tests/TestUtilities/ServerTestBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ protected ServerTestBase(TFixture fixture, ITestOutputHelper outputHelper, strin
3636

3737
public string ImageSource { get; }
3838

39-
[Fact(Skip = "Investigating connection refused errors")]
39+
[Fact]
4040
public async Task CanProcessAndResolveImageAsync()
4141
{
4242
string url = this.ImageSource;
@@ -115,7 +115,7 @@ public async Task CanProcessAndResolveImageAsync()
115115
response.Dispose();
116116
}
117117

118-
[Fact(Skip = "Investigating connection refused errors")]
118+
[Fact]
119119
public async Task CanProcessMultipleIdenticalQueriesAsync()
120120
{
121121
string url = this.ImageSource;

tests/ImageSharp.Web.Tests/TestUtilities/TestConstants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public static class TestConstants
88
public const string AzureConnectionString = "UseDevelopmentStorage=true";
99
public const string AzureContainerName = "azure";
1010
public const string AzureCacheContainerName = "is-cache";
11-
public const string AWSEndpoint = "http://127.0.0.1:4568/";
11+
public const string AWSEndpoint = "http://127.0.0.1:10003/";
1212
public const string AWSRegion = "eu-west-2";
1313
public const string AWSBucketName = "aws";
1414
public const string AWSCacheBucketName = "aws-cache";

0 commit comments

Comments
 (0)