Skip to content

Commit facb8e9

Browse files
w1amw1am
committed
Test workflow
1 parent a0dd296 commit facb8e9

File tree

3 files changed

+70
-71
lines changed

3 files changed

+70
-71
lines changed

‎.github/workflows/base.yml

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353
uses: actions/setup-dotnet@v3
5454
with:
5555
dotnet-version: |
56+
8.0.x
5657
9.0.x
5758
- name: Run Tests
5859
shell: bash

‎test/Kurrent.Client.Tests.Common/Fixtures/KurrentPermanentFixture.cs

+35-36
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ protected KurrentPermanentFixture(ConfigureFixture configure) {
3737

3838
public ILogger Log => Logger;
3939

40-
public ITestService Service { get; }
40+
public ITestService Service { get; }
4141
public KurrentFixtureOptions Options { get; }
42-
public Faker Faker { get; } = new Faker();
42+
public Faker Faker { get; } = new Faker();
4343

44-
public Version EventStoreVersion { get; private set; } = null!;
44+
// public Version EventStoreVersion { get; private set; } = null!;
4545
public bool EventStoreHasLastStreamPosition { get; private set; }
4646

4747
public KurrentClient Streams { get; private set; } = null!;
@@ -87,13 +87,12 @@ public async Task InitializeAsync() {
8787
await ContainerSemaphore.WaitAsync();
8888
try {
8989
await Service.Start();
90+
// EventStoreVersion = GetEventStoreVersion();
91+
// EventStoreHasLastStreamPosition = (EventStoreVersion?.Major ?? int.MaxValue) >= 21;
9092
} finally {
9193
ContainerSemaphore.Release();
9294
}
9395

94-
EventStoreVersion = GetEventStoreVersion();
95-
EventStoreHasLastStreamPosition = (EventStoreVersion?.Major ?? int.MaxValue) >= 21;
96-
9796
await WarmUpGatekeeper.WaitAsync();
9897

9998
try {
@@ -133,36 +132,36 @@ async Task<T> InitClient<T>(Func<T, Task> action, bool execute = true) where T :
133132
return client;
134133
}
135134

136-
static Version GetEventStoreVersion() {
137-
const string versionPrefix = "EventStoreDB version";
138-
139-
using var cancellator = new CancellationTokenSource(FromSeconds(30));
140-
using var eventstore = new Builder()
141-
.UseContainer()
142-
.UseImage(GlobalEnvironment.DockerImage)
143-
.Command("--version")
144-
.Build()
145-
.Start();
146-
147-
using var log = eventstore.Logs(true, cancellator.Token);
148-
foreach (var line in log.ReadToEnd()) {
149-
if (line.StartsWith(versionPrefix) &&
150-
Version.TryParse(
151-
new string(ReadVersion(line[(versionPrefix.Length + 1)..]).ToArray()),
152-
out var version
153-
)) {
154-
return version;
155-
}
156-
}
157-
158-
throw new InvalidOperationException("Could not determine server version.");
159-
160-
IEnumerable<char> ReadVersion(string s) {
161-
foreach (var c in s.TakeWhile(c => c == '.' || char.IsDigit(c))) {
162-
yield return c;
163-
}
164-
}
165-
}
135+
// static Version GetEventStoreVersion() {
136+
// const string versionPrefix = "EventStoreDB version";
137+
//
138+
// using var cancellator = new CancellationTokenSource(FromSeconds(30));
139+
// using var eventstore = new Builder()
140+
// .UseContainer()
141+
// .UseImage(GlobalEnvironment.DockerImage)
142+
// .Command("--version")
143+
// .Build()
144+
// .Start();
145+
//
146+
// using var log = eventstore.Logs(true, cancellator.Token);
147+
// foreach (var line in log.ReadToEnd()) {
148+
// if (line.StartsWith(versionPrefix) &&
149+
// Version.TryParse(
150+
// new string(ReadVersion(line[(versionPrefix.Length + 1)..]).ToArray()),
151+
// out var version
152+
// )) {
153+
// return version;
154+
// }
155+
// }
156+
//
157+
// throw new InvalidOperationException("Could not determine server version.");
158+
//
159+
// IEnumerable<char> ReadVersion(string s) {
160+
// foreach (var c in s.TakeWhile(c => c == '.' || char.IsDigit(c))) {
161+
// yield return c;
162+
// }
163+
// }
164+
// }
166165
}
167166

168167
public async Task DisposeAsync() {

‎test/Kurrent.Client.Tests.Common/Fixtures/KurrentTemporaryFixture.cs

+34-35
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ protected KurrentTemporaryFixture(ConfigureFixture configure) {
4040

4141
public ILogger Log => Logger;
4242

43-
public ITestService Service { get; }
43+
public ITestService Service { get; }
4444
public KurrentFixtureOptions Options { get; }
45-
public Faker Faker { get; } = new Faker();
45+
public Faker Faker { get; } = new Faker();
4646

4747
public Version EventStoreVersion { get; private set; } = null!;
4848
public bool EventStoreHasLastStreamPosition { get; private set; }
@@ -89,13 +89,12 @@ public async Task InitializeAsync() {
8989
await ContainerSemaphore.WaitAsync();
9090
try {
9191
await Service.Start();
92+
// EventStoreVersion = GetEventStoreVersion();
93+
// EventStoreHasLastStreamPosition = (EventStoreVersion?.Major ?? int.MaxValue) >= 21;
9294
} finally {
9395
ContainerSemaphore.Release();
9496
}
9597

96-
EventStoreVersion = GetEventStoreVersion();
97-
EventStoreHasLastStreamPosition = (EventStoreVersion?.Major ?? int.MaxValue) >= 21;
98-
9998
await WarmUpGatekeeper.WaitAsync();
10099

101100
try {
@@ -135,36 +134,36 @@ async Task<T> InitClient<T>(Func<T, Task> action, bool execute = true) where T :
135134
return client;
136135
}
137136

138-
static Version GetEventStoreVersion() {
139-
const string versionPrefix = "EventStoreDB version";
140-
141-
using var cancellator = new CancellationTokenSource(FromSeconds(30));
142-
using var eventstore = new Builder()
143-
.UseContainer()
144-
.UseImage(GlobalEnvironment.DockerImage)
145-
.Command("--version")
146-
.Build()
147-
.Start();
148-
149-
using var log = eventstore.Logs(true, cancellator.Token);
150-
foreach (var line in log.ReadToEnd()) {
151-
if (line.StartsWith(versionPrefix) &&
152-
Version.TryParse(
153-
new string(ReadVersion(line[(versionPrefix.Length + 1)..]).ToArray()),
154-
out var version
155-
)) {
156-
return version;
157-
}
158-
}
159-
160-
throw new InvalidOperationException("Could not determine server version.");
161-
162-
IEnumerable<char> ReadVersion(string s) {
163-
foreach (var c in s.TakeWhile(c => c == '.' || char.IsDigit(c))) {
164-
yield return c;
165-
}
166-
}
167-
}
137+
// static Version GetEventStoreVersion() {
138+
// const string versionPrefix = "EventStoreDB version";
139+
//
140+
// using var cancellator = new CancellationTokenSource(FromSeconds(30));
141+
// using var eventstore = new Builder()
142+
// .UseContainer()
143+
// .UseImage(GlobalEnvironment.DockerImage)
144+
// .Command("--version")
145+
// .Build()
146+
// .Start();
147+
//
148+
// using var log = eventstore.Logs(true, cancellator.Token);
149+
// foreach (var line in log.ReadToEnd()) {
150+
// if (line.StartsWith(versionPrefix) &&
151+
// Version.TryParse(
152+
// new string(ReadVersion(line[(versionPrefix.Length + 1)..]).ToArray()),
153+
// out var version
154+
// )) {
155+
// return version;
156+
// }
157+
// }
158+
//
159+
// throw new InvalidOperationException("Could not determine server version.");
160+
//
161+
// IEnumerable<char> ReadVersion(string s) {
162+
// foreach (var c in s.TakeWhile(c => c == '.' || char.IsDigit(c))) {
163+
// yield return c;
164+
// }
165+
// }
166+
// }
168167
}
169168

170169
public async Task DisposeAsync() {

0 commit comments

Comments
 (0)