Restores project references.

This commit is contained in:
benbierens 2023-09-20 10:59:52 +02:00
parent 09670e00e9
commit bf4c8d8026
No known key found for this signature in database
GPG Key ID: FE44815D96D0A1AA
13 changed files with 44 additions and 40 deletions

View File

@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Core\Core.csproj" /> <ProjectReference Include="..\..\Framework\Core\Core.csproj" />
<ProjectReference Include="..\GethPlugin\GethPlugin.csproj" /> <ProjectReference Include="..\GethPlugin\GethPlugin.csproj" />
</ItemGroup> </ItemGroup>

View File

@ -11,12 +11,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Framework\Core\Core.csproj" />
<ProjectReference Include="..\..\Framework\KubernetesWorkflow\KubernetesWorkflow.csproj" />
<ProjectReference Include="..\CodexContractsPlugin\CodexContractsPlugin.csproj" /> <ProjectReference Include="..\CodexContractsPlugin\CodexContractsPlugin.csproj" />
<ProjectReference Include="..\Core\Core.csproj" />
<ProjectReference Include="..\GethPlugin\GethPlugin.csproj" /> <ProjectReference Include="..\GethPlugin\GethPlugin.csproj" />
<ProjectReference Include="..\KubernetesWorkflow\KubernetesWorkflow.csproj" />
<ProjectReference Include="..\MetricsPlugin\MetricsPlugin.csproj" /> <ProjectReference Include="..\MetricsPlugin\MetricsPlugin.csproj" />
<ProjectReference Include="..\Nethereum\NethereumWorkflow.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -7,9 +7,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Core\Core.csproj" /> <ProjectReference Include="..\..\Framework\Core\Core.csproj" />
<ProjectReference Include="..\KubernetesWorkflow\KubernetesWorkflow.csproj" /> <ProjectReference Include="..\..\Framework\KubernetesWorkflow\KubernetesWorkflow.csproj" />
<ProjectReference Include="..\Nethereum\NethereumWorkflow.csproj" /> <ProjectReference Include="..\..\Framework\NethereumWorkflow\NethereumWorkflow.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -17,7 +17,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Core\Core.csproj" /> <ProjectReference Include="..\..\Framework\Core\Core.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -1,12 +1,13 @@
using DistTestCore; using DistTestCore;
using FileUtils; using FileUtils;
using NUnit.Framework; using NUnit.Framework;
using Tests;
using Utils; using Utils;
namespace TestsLong.BasicTests namespace CodexLongTests.BasicTests
{ {
[TestFixture] [TestFixture]
public class DownloadTests : DistTest public class DownloadTests : CodexDistTest
{ {
[TestCase(3, 500)] [TestCase(3, 500)]
[TestCase(5, 100)] [TestCase(5, 100)]
@ -14,8 +15,8 @@ namespace TestsLong.BasicTests
[UseLongTimeouts] [UseLongTimeouts]
public void ParallelDownload(int numberOfNodes, int filesizeMb) public void ParallelDownload(int numberOfNodes, int filesizeMb)
{ {
var group = SetupCodexNodes(numberOfNodes); var group = AddCodex(numberOfNodes);
var host = SetupCodexNode(); var host = AddCodex();
foreach (var node in group) foreach (var node in group)
{ {
@ -24,7 +25,7 @@ namespace TestsLong.BasicTests
var testFile = GenerateTestFile(filesizeMb.MB()); var testFile = GenerateTestFile(filesizeMb.MB());
var contentId = host.UploadFile(testFile); var contentId = host.UploadFile(testFile);
var list = new List<Task<TestFile?>>(); var list = new List<Task<TrackedFile?>>();
foreach (var node in group) foreach (var node in group)
{ {

View File

@ -1,13 +1,14 @@
using DistTestCore; using CodexPlugin;
using DistTestCore.Codex; using DistTestCore;
using NUnit.Framework; using NUnit.Framework;
using NUnit.Framework.Interfaces; using NUnit.Framework.Interfaces;
using Tests;
using Utils; using Utils;
namespace TestsLong.BasicTests namespace CodexLongTests.BasicTests
{ {
[TestFixture] [TestFixture]
public class LargeFileTests : DistTest public class LargeFileTests : CodexDistTest
{ {
#region Abort test run after first failure #region Abort test run after first failure
@ -47,7 +48,7 @@ namespace TestsLong.BasicTests
var expectedFile = GenerateTestFile(sizeMB); var expectedFile = GenerateTestFile(sizeMB);
var node = SetupCodexNode(s => s.WithStorageQuota((size + 10).MB())); var node = AddCodex(s => s.WithStorageQuota((size + 10).MB()));
var uploadStart = DateTime.UtcNow; var uploadStart = DateTime.UtcNow;
var cid = node.UploadFile(expectedFile); var cid = node.UploadFile(expectedFile);

View File

@ -1,14 +1,15 @@
using DistTestCore; using DistTestCore;
using NUnit.Framework; using NUnit.Framework;
using Tests;
namespace TestsLong.BasicTests namespace CodexLongTests.BasicTests
{ {
public class TestInfraTests : DistTest public class TestInfraTests : CodexDistTest
{ {
[Test, UseLongTimeouts] [Test, UseLongTimeouts]
public void TestInfraShouldHave1000AddressSpacesPerPod() public void TestInfraShouldHave1000AddressSpacesPerPod()
{ {
var group = SetupCodexNodes(1000, s => s.EnableMetrics()); // Increases use of port address space per node. var group = AddCodex(1000, s => s.EnableMetrics());
var nodeIds = group.Select(n => n.GetDebugInfo().id).ToArray(); var nodeIds = group.Select(n => n.GetDebugInfo().id).ToArray();
@ -21,7 +22,7 @@ namespace TestsLong.BasicTests
{ {
for (var i = 0; i < 20; i++) for (var i = 0; i < 20; i++)
{ {
var n = SetupCodexNode(); var n = AddCodex();
Assert.That(!string.IsNullOrEmpty(n.GetDebugInfo().id)); Assert.That(!string.IsNullOrEmpty(n.GetDebugInfo().id));
} }

View File

@ -1,12 +1,14 @@
using CodexPlugin;
using DistTestCore; using DistTestCore;
using FileUtils; using FileUtils;
using NUnit.Framework; using NUnit.Framework;
using Tests;
using Utils; using Utils;
namespace TestsLong.BasicTests namespace CodexLongTests.BasicTests
{ {
[TestFixture] [TestFixture]
public class UploadTests : DistTest public class UploadTests : CodexDistTest
{ {
[TestCase(3, 50)] [TestCase(3, 50)]
[TestCase(5, 75)] [TestCase(5, 75)]
@ -14,15 +16,15 @@ namespace TestsLong.BasicTests
[UseLongTimeouts] [UseLongTimeouts]
public void ParallelUpload(int numberOfNodes, int filesizeMb) public void ParallelUpload(int numberOfNodes, int filesizeMb)
{ {
var group = SetupCodexNodes(numberOfNodes); var group = AddCodex(numberOfNodes);
var host = SetupCodexNode(); var host = AddCodex();
foreach (var node in group) foreach (var node in group)
{ {
host.ConnectToPeer(node); host.ConnectToPeer(node);
} }
var testfiles = new List<TestFile>(); var testfiles = new List<TrackedFile>();
var contentIds = new List<Task<ContentId>>(); var contentIds = new List<Task<ContentId>>();
for (int i = 0; i < group.Count(); i++) for (int i = 0; i < group.Count(); i++)
@ -31,7 +33,7 @@ namespace TestsLong.BasicTests
var n = i; var n = i;
contentIds.Add(Task.Run(() => { return host.UploadFile(testfiles[n]); })); contentIds.Add(Task.Run(() => { return host.UploadFile(testfiles[n]); }));
} }
var downloads = new List<Task<TestFile?>>(); var downloads = new List<Task<TrackedFile?>>();
for (int i = 0; i < group.Count(); i++) for (int i = 0; i < group.Count(); i++)
{ {
var n = i; var n = i;

View File

@ -13,6 +13,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Framework\Core\Core.csproj" />
<ProjectReference Include="..\CodexTests\CodexTests.csproj" />
<ProjectReference Include="..\DistTestCore\DistTestCore.csproj" /> <ProjectReference Include="..\DistTestCore\DistTestCore.csproj" />
</ItemGroup> </ItemGroup>

View File

@ -1,8 +1,9 @@
using DistTestCore; using DistTestCore;
using NUnit.Framework; using NUnit.Framework;
using Tests;
using Utils; using Utils;
namespace TestsLong.DownloadConnectivityTests namespace CodexLongTests.DownloadConnectivityTests
{ {
[TestFixture] [TestFixture]
public class LongFullyConnectedDownloadTests : AutoBootstrapDistTest public class LongFullyConnectedDownloadTests : AutoBootstrapDistTest
@ -14,7 +15,7 @@ namespace TestsLong.DownloadConnectivityTests
[Values(10, 15, 20)] int numberOfNodes, [Values(10, 15, 20)] int numberOfNodes,
[Values(10, 100)] int sizeMBs) [Values(10, 100)] int sizeMBs)
{ {
for (var i = 0; i < numberOfNodes; i++) SetupCodexNode(); for (var i = 0; i < numberOfNodes; i++) AddCodex();
CreatePeerDownloadTestHelpers().AssertFullDownloadInterconnectivity(GetAllOnlineCodexNodes(), sizeMBs.MB()); CreatePeerDownloadTestHelpers().AssertFullDownloadInterconnectivity(GetAllOnlineCodexNodes(), sizeMBs.MB());
} }

View File

@ -1,6 +1,6 @@
using NUnit.Framework; using NUnit.Framework;
[assembly: LevelOfParallelism(1)] [assembly: LevelOfParallelism(1)]
namespace Tests namespace CodexLongTests
{ {
} }

View File

@ -13,11 +13,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\CodexContractsPlugin\CodexContractsPlugin.csproj" /> <ProjectReference Include="..\..\ProjectPlugins\CodexContractsPlugin\CodexContractsPlugin.csproj" />
<ProjectReference Include="..\CodexPlugin\CodexPlugin.csproj" /> <ProjectReference Include="..\..\ProjectPlugins\CodexPlugin\CodexPlugin.csproj" />
<ProjectReference Include="..\..\ProjectPlugins\GethPlugin\GethPlugin.csproj" />
<ProjectReference Include="..\..\ProjectPlugins\MetricsPlugin\MetricsPlugin.csproj" />
<ProjectReference Include="..\DistTestCore\DistTestCore.csproj" /> <ProjectReference Include="..\DistTestCore\DistTestCore.csproj" />
<ProjectReference Include="..\GethPlugin\GethPlugin.csproj" />
<ProjectReference Include="..\MetricsPlugin\MetricsPlugin.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -19,10 +19,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Core\Core.csproj" /> <ProjectReference Include="..\..\Framework\Core\Core.csproj" />
<ProjectReference Include="..\FileUtils\FileUtils.csproj" /> <ProjectReference Include="..\..\Framework\FileUtils\FileUtils.csproj" />
<ProjectReference Include="..\KubernetesWorkflow\KubernetesWorkflow.csproj" />
<ProjectReference Include="..\Logging\Logging.csproj" />
<ProjectReference Include="..\Nethereum\NethereumWorkflow.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>