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.

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

⬇️ Downgrade xUnit packages to fix CI #3661

Merged
merged 2 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Libplanet.Action.Tests/Libplanet.Action.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<PackageReference Include="xRetry" Version="1.5.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="Xunit.SkippableFact" Version="1.3.12" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion Libplanet.Analyzers.Tests/Libplanet.Analyzers.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</PackageReference>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
</ItemGroup>

<ItemGroup Condition="'$(SkipSonar)' != 'true'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<PackageReference Include="System.Collections.Immutable" Version="1.7.*" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
</ItemGroup>

<ItemGroup Condition="'$(SkipSonar)' != 'true'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</PackageReference>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
</ItemGroup>

<ItemGroup Condition="'$(SkipSonar)' != 'true'">
Expand Down
2 changes: 1 addition & 1 deletion Libplanet.Explorer.Tests/Libplanet.Explorer.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageReference Include="JunitXml.TestLogger" Version="3.0.98" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<PackageReference Include="System.Collections.Immutable" Version="1.7.*" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
</ItemGroup>

<ItemGroup Condition="'$(SkipSonar)' != 'true'">
Expand Down
12 changes: 6 additions & 6 deletions Libplanet.Net.Tests/Consensus/ConsensusContextTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@ public async void NewHeightIncreasing()
Assert.Throws<InvalidHeightIncreasingException>(() => consensusContext.NewHeight(3));

await proposalMessageSent.WaitAsync();
Assert.NotNull(proposal?.BlockHash);
BlockHash proposedblockHash = Assert.IsType<BlockHash>(proposal?.BlockHash);

consensusContext.HandleMessage(new ConsensusPreCommitMsg(TestUtils.CreateVote(
TestUtils.PrivateKeys[0], 3, hash: proposal.BlockHash, flag: VoteFlag.PreCommit)));
TestUtils.PrivateKeys[0], 3, hash: proposedblockHash, flag: VoteFlag.PreCommit)));
consensusContext.HandleMessage(new ConsensusPreCommitMsg(TestUtils.CreateVote(
TestUtils.PrivateKeys[1], 3, hash: proposal.BlockHash, flag: VoteFlag.PreCommit)));
TestUtils.PrivateKeys[1], 3, hash: proposedblockHash, flag: VoteFlag.PreCommit)));
consensusContext.HandleMessage(new ConsensusPreCommitMsg(TestUtils.CreateVote(
TestUtils.PrivateKeys[2], 3, hash: proposal.BlockHash, flag: VoteFlag.PreCommit)));
TestUtils.PrivateKeys[2], 3, hash: proposedblockHash, flag: VoteFlag.PreCommit)));

// Waiting for commit.
await heightThreeStepChangedToEndCommit.WaitAsync();
Expand Down Expand Up @@ -224,7 +224,7 @@ public async void VoteSetGetOnlyProposeCommitHash()
consensusContext.NewHeight(blockChain.Tip.Index + 1);

await heightOneProposalSent.WaitAsync();
Assert.NotNull(proposal?.BlockHash);
BlockHash proposedblockHash = Assert.IsType<BlockHash>(proposal?.BlockHash);

votes.Add(TestUtils.CreateVote(
TestUtils.PrivateKeys[0],
Expand All @@ -236,7 +236,7 @@ public async void VoteSetGetOnlyProposeCommitHash()
TestUtils.PrivateKeys[x],
1,
0,
proposal.BlockHash,
proposedblockHash,
VoteFlag.PreCommit)));

foreach (var vote in votes)
Expand Down
10 changes: 5 additions & 5 deletions Libplanet.Net.Tests/Consensus/ContextProposerTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -106,29 +106,29 @@ public async void EnterPreCommitBlock()

// Wait for propose to process.
await proposalSent.WaitAsync();
Assert.NotNull(proposal?.BlockHash);
BlockHash proposedblockHash = Assert.IsType<BlockHash>(proposal?.BlockHash);

context.ProduceMessage(
new ConsensusPreVoteMsg(TestUtils.CreateVote(
TestUtils.PrivateKeys[0],
1,
hash: proposal.BlockHash,
hash: proposedblockHash,
flag: VoteFlag.PreVote)));
context.ProduceMessage(
new ConsensusPreVoteMsg(TestUtils.CreateVote(
TestUtils.PrivateKeys[2],
1,
hash: proposal.BlockHash,
hash: proposedblockHash,
flag: VoteFlag.PreVote)));
context.ProduceMessage(
new ConsensusPreVoteMsg(TestUtils.CreateVote(
TestUtils.PrivateKeys[3],
1,
hash: proposal.BlockHash,
hash: proposedblockHash,
flag: VoteFlag.PreVote)));

await Task.WhenAll(preCommitSent.WaitAsync(), stepChangedToPreCommit.WaitAsync());
Assert.Equal(proposal?.BlockHash, preCommit?.BlockHash);
Assert.Equal(proposedblockHash, preCommit?.BlockHash);
Assert.Equal(1, context.Height);
Assert.Equal(0, context.Round);
Assert.Equal(ConsensusStep.PreCommit, context.Step);
Expand Down
6 changes: 3 additions & 3 deletions Libplanet.Net.Tests/Libplanet.Net.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
runtime; build; native; contentfiles; analyzers
</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="Xunit.SkippableFact" Version="1.3.12" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<PackageReference Include="System.Collections.Immutable" Version="1.7.*" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
</ItemGroup>

<ItemGroup Condition="'$(SkipSonar)' != 'true'">
Expand Down
2 changes: 1 addition & 1 deletion Libplanet.Stun.Tests/Libplanet.Stun.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</PackageReference>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>
runtime; build; native; contentfiles; analyzers
Expand Down
2 changes: 1 addition & 1 deletion Libplanet.Tests/Libplanet.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<PackageReference Include="xRetry" Version="1.5.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="Xunit.SkippableFact" Version="1.3.12" />
</ItemGroup>

Expand Down
Loading