Skip to content

Commit d37bc7c

Browse files
committed
More tests
1 parent f68cec0 commit d37bc7c

File tree

5 files changed

+9
-25
lines changed

5 files changed

+9
-25
lines changed

.github/workflows/base.yml

+1-12
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,17 @@ on:
1515
required: false
1616
type: string
1717
default: eventstore-ce/eventstoredb-ce
18-
# test:
19-
# required: true
20-
# type: string
2118

2219
jobs:
2320
test:
2421
timeout-minutes: 20
2522
strategy:
2623
fail-fast: false
2724
matrix:
28-
framework: [ net9.0 ]
25+
framework: [ net8.0, net9.0 ]
2926
os: [ ubuntu-latest ]
3027
configuration: [ release ]
3128
runs-on: ${{ matrix.os }}
32-
# name: ${{ inputs.test }} (${{ matrix.os }}, ${{ matrix.framework }})
3329
name: (${{ matrix.os }}, ${{ matrix.framework }})
3430
env:
3531
CLOUDSMITH_CICD_USER: ${{ secrets.CLOUDSMITH_CICD_USER }}
@@ -66,10 +62,3 @@ jobs:
6662
--logger:"GitHubActions;report-warnings=false" --logger:"console;verbosity=normal" \
6763
--framework ${{ matrix.framework }} \
6864
test/Kurrent.Client.Tests
69-
70-
# run: |
71-
# sudo ./gencert.sh
72-
# dotnet test --configuration ${{ matrix.configuration }} --blame \
73-
# --logger:"GitHubActions;report-warnings=false" --logger:"console;verbosity=normal" \
74-
# --framework ${{ matrix.framework }} \
75-
# test/EventStore.Client.${{ inputs.test }}.Tests

.github/workflows/ci.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,11 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
# docker-tag: [ ci, lts, previous-lts ]
18-
docker-tag: [ ci ]
19-
# test: [ Streams, PersistentSubscriptions, Operations, UserManagement, ProjectionManagement ]
17+
docker-tag: [ ci, lts, previous-lts ]
2018
name: Test CE (${{ matrix.docker-tag }})
2119
with:
2220
docker-tag: ${{ matrix.docker-tag }}
2321
docker-image: eventstore-ce/eventstoredb-ce
24-
# test: ${{ matrix.test }}
2522
# ee:
2623
# uses: ./.github/workflows/base.yml
2724
# if: ${{ github.repository_owner == 'EventStore' }}

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public async Task InitializeAsync() {
8787
await ContainerSemaphore.WaitAsync();
8888
try {
8989
await Service.Start();
90-
EventStoreVersion = GetEventStoreVersion();
90+
EventStoreVersion = GetKurrentVersion();
9191
EventStoreHasLastStreamPosition = (EventStoreVersion?.Major ?? int.MaxValue) >= 21;
9292
// EventStoreHasLastStreamPosition = true;
9393
} finally {
@@ -133,7 +133,7 @@ async Task<T> InitClient<T>(Func<T, Task> action, bool execute = true) where T :
133133
return client;
134134
}
135135

136-
static Version GetEventStoreVersion() {
136+
static Version GetKurrentVersion() {
137137
const string versionPrefix = "EventStoreDB version";
138138

139139
using var cancellator = new CancellationTokenSource(FromSeconds(30));
@@ -146,8 +146,7 @@ static Version GetEventStoreVersion() {
146146

147147
using var log = eventstore.Logs(true, cancellator.Token);
148148
foreach (var line in log.ReadToEnd()) {
149-
Logger.Warning("line---> {line}", line);
150-
149+
Logger.Information("EventStoreDB: {Line}", line);
151150
if (line.StartsWith(versionPrefix) &&
152151
Version.TryParse(
153152
new string(ReadVersion(line[(versionPrefix.Length + 1)..]).ToArray()),

test/Kurrent.Client.Tests.Common/Fixtures/KurrentPermanentTestNode.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ async Task<int> GetNextAvailablePort(TimeSpan delay = default) {
189189
#if NET
190190
if (socket.Connected) await socket.DisconnectAsync(true);
191191
#else
192-
if (socket.Connected) socket.Disconnect(true);
192+
if (socket.Connected) socket.Disconnect(true);
193193
#endif
194194
}
195195
}

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public async Task InitializeAsync() {
8989
await ContainerSemaphore.WaitAsync();
9090
try {
9191
await Service.Start();
92-
EventStoreVersion = GetEventStoreVersion();
92+
EventStoreVersion = GetKurrentVersion();
9393
EventStoreHasLastStreamPosition = (EventStoreVersion?.Major ?? int.MaxValue) >= 21;
9494
// EventStoreHasLastStreamPosition = true;
9595
} finally {
@@ -135,7 +135,7 @@ async Task<T> InitClient<T>(Func<T, Task> action, bool execute = true) where T :
135135
return client;
136136
}
137137

138-
static Version GetEventStoreVersion() {
138+
static Version GetKurrentVersion() {
139139
const string versionPrefix = "EventStoreDB version";
140140

141141
using var cancellator = new CancellationTokenSource(FromSeconds(30));
@@ -148,8 +148,7 @@ static Version GetEventStoreVersion() {
148148

149149
using var log = eventstore.Logs(true, cancellator.Token);
150150
foreach (var line in log.ReadToEnd()) {
151-
Logger.Warning("line---> {line}", line);
152-
151+
Logger.Information("EventStoreDB: {Line}", line);
153152
if (line.StartsWith(versionPrefix) &&
154153
Version.TryParse(
155154
new string(ReadVersion(line[(versionPrefix.Length + 1)..]).ToArray()),

0 commit comments

Comments
 (0)