From bf4c8d80265dfa24278bcd5da6dedb86de59005b Mon Sep 17 00:00:00 2001 From: benbierens Date: Wed, 20 Sep 2023 10:59:52 +0200 Subject: [PATCH] Restores project references. --- .../CodexContractsPlugin.csproj | 2 +- ProjectPlugins/CodexPlugin/CodexPlugin.csproj | 5 ++--- ProjectPlugins/GethPlugin/GethPlugin.csproj | 6 +++--- ProjectPlugins/MetricsPlugin/MetricsPlugin.csproj | 2 +- Tests/CodexLongTests/BasicTests/DownloadTests.cs | 11 ++++++----- Tests/CodexLongTests/BasicTests/LargeFileTests.cs | 11 ++++++----- Tests/CodexLongTests/BasicTests/TestInfraTests.cs | 9 +++++---- Tests/CodexLongTests/BasicTests/UploadTests.cs | 14 ++++++++------ Tests/CodexLongTests/CodexTestsLong.csproj | 2 ++ .../LongFullyConnectedDownloadTests.cs | 5 +++-- Tests/CodexLongTests/Parallelism.cs | 2 +- Tests/CodexTests/CodexTests.csproj | 8 ++++---- Tests/DistTestCore/DistTestCore.csproj | 7 ++----- 13 files changed, 44 insertions(+), 40 deletions(-) diff --git a/ProjectPlugins/CodexContractsPlugin/CodexContractsPlugin.csproj b/ProjectPlugins/CodexContractsPlugin/CodexContractsPlugin.csproj index f7a4e57..648b846 100644 --- a/ProjectPlugins/CodexContractsPlugin/CodexContractsPlugin.csproj +++ b/ProjectPlugins/CodexContractsPlugin/CodexContractsPlugin.csproj @@ -7,7 +7,7 @@ - + diff --git a/ProjectPlugins/CodexPlugin/CodexPlugin.csproj b/ProjectPlugins/CodexPlugin/CodexPlugin.csproj index aac490c..19c3b60 100644 --- a/ProjectPlugins/CodexPlugin/CodexPlugin.csproj +++ b/ProjectPlugins/CodexPlugin/CodexPlugin.csproj @@ -11,12 +11,11 @@ + + - - - diff --git a/ProjectPlugins/GethPlugin/GethPlugin.csproj b/ProjectPlugins/GethPlugin/GethPlugin.csproj index 3b52869..73aae77 100644 --- a/ProjectPlugins/GethPlugin/GethPlugin.csproj +++ b/ProjectPlugins/GethPlugin/GethPlugin.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/ProjectPlugins/MetricsPlugin/MetricsPlugin.csproj b/ProjectPlugins/MetricsPlugin/MetricsPlugin.csproj index ec0e3ef..f921934 100644 --- a/ProjectPlugins/MetricsPlugin/MetricsPlugin.csproj +++ b/ProjectPlugins/MetricsPlugin/MetricsPlugin.csproj @@ -17,7 +17,7 @@ - + diff --git a/Tests/CodexLongTests/BasicTests/DownloadTests.cs b/Tests/CodexLongTests/BasicTests/DownloadTests.cs index 0cf97e9..68de3b1 100644 --- a/Tests/CodexLongTests/BasicTests/DownloadTests.cs +++ b/Tests/CodexLongTests/BasicTests/DownloadTests.cs @@ -1,12 +1,13 @@ using DistTestCore; using FileUtils; using NUnit.Framework; +using Tests; using Utils; -namespace TestsLong.BasicTests +namespace CodexLongTests.BasicTests { [TestFixture] - public class DownloadTests : DistTest + public class DownloadTests : CodexDistTest { [TestCase(3, 500)] [TestCase(5, 100)] @@ -14,8 +15,8 @@ namespace TestsLong.BasicTests [UseLongTimeouts] public void ParallelDownload(int numberOfNodes, int filesizeMb) { - var group = SetupCodexNodes(numberOfNodes); - var host = SetupCodexNode(); + var group = AddCodex(numberOfNodes); + var host = AddCodex(); foreach (var node in group) { @@ -24,7 +25,7 @@ namespace TestsLong.BasicTests var testFile = GenerateTestFile(filesizeMb.MB()); var contentId = host.UploadFile(testFile); - var list = new List>(); + var list = new List>(); foreach (var node in group) { diff --git a/Tests/CodexLongTests/BasicTests/LargeFileTests.cs b/Tests/CodexLongTests/BasicTests/LargeFileTests.cs index 2d834e5..68eb1a7 100644 --- a/Tests/CodexLongTests/BasicTests/LargeFileTests.cs +++ b/Tests/CodexLongTests/BasicTests/LargeFileTests.cs @@ -1,13 +1,14 @@ -using DistTestCore; -using DistTestCore.Codex; +using CodexPlugin; +using DistTestCore; using NUnit.Framework; using NUnit.Framework.Interfaces; +using Tests; using Utils; -namespace TestsLong.BasicTests +namespace CodexLongTests.BasicTests { [TestFixture] - public class LargeFileTests : DistTest + public class LargeFileTests : CodexDistTest { #region Abort test run after first failure @@ -47,7 +48,7 @@ namespace TestsLong.BasicTests 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 cid = node.UploadFile(expectedFile); diff --git a/Tests/CodexLongTests/BasicTests/TestInfraTests.cs b/Tests/CodexLongTests/BasicTests/TestInfraTests.cs index a6f68e3..caad570 100644 --- a/Tests/CodexLongTests/BasicTests/TestInfraTests.cs +++ b/Tests/CodexLongTests/BasicTests/TestInfraTests.cs @@ -1,14 +1,15 @@ using DistTestCore; using NUnit.Framework; +using Tests; -namespace TestsLong.BasicTests +namespace CodexLongTests.BasicTests { - public class TestInfraTests : DistTest + public class TestInfraTests : CodexDistTest { [Test, UseLongTimeouts] 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(); @@ -21,7 +22,7 @@ namespace TestsLong.BasicTests { for (var i = 0; i < 20; i++) { - var n = SetupCodexNode(); + var n = AddCodex(); Assert.That(!string.IsNullOrEmpty(n.GetDebugInfo().id)); } diff --git a/Tests/CodexLongTests/BasicTests/UploadTests.cs b/Tests/CodexLongTests/BasicTests/UploadTests.cs index 516586e..b2cadc0 100644 --- a/Tests/CodexLongTests/BasicTests/UploadTests.cs +++ b/Tests/CodexLongTests/BasicTests/UploadTests.cs @@ -1,12 +1,14 @@ +using CodexPlugin; using DistTestCore; using FileUtils; using NUnit.Framework; +using Tests; using Utils; -namespace TestsLong.BasicTests +namespace CodexLongTests.BasicTests { [TestFixture] - public class UploadTests : DistTest + public class UploadTests : CodexDistTest { [TestCase(3, 50)] [TestCase(5, 75)] @@ -14,15 +16,15 @@ namespace TestsLong.BasicTests [UseLongTimeouts] public void ParallelUpload(int numberOfNodes, int filesizeMb) { - var group = SetupCodexNodes(numberOfNodes); - var host = SetupCodexNode(); + var group = AddCodex(numberOfNodes); + var host = AddCodex(); foreach (var node in group) { host.ConnectToPeer(node); } - var testfiles = new List(); + var testfiles = new List(); var contentIds = new List>(); for (int i = 0; i < group.Count(); i++) @@ -31,7 +33,7 @@ namespace TestsLong.BasicTests var n = i; contentIds.Add(Task.Run(() => { return host.UploadFile(testfiles[n]); })); } - var downloads = new List>(); + var downloads = new List>(); for (int i = 0; i < group.Count(); i++) { var n = i; diff --git a/Tests/CodexLongTests/CodexTestsLong.csproj b/Tests/CodexLongTests/CodexTestsLong.csproj index 90f1cd6..71c6756 100644 --- a/Tests/CodexLongTests/CodexTestsLong.csproj +++ b/Tests/CodexLongTests/CodexTestsLong.csproj @@ -13,6 +13,8 @@ + + diff --git a/Tests/CodexLongTests/DownloadConnectivityTests/LongFullyConnectedDownloadTests.cs b/Tests/CodexLongTests/DownloadConnectivityTests/LongFullyConnectedDownloadTests.cs index 6de5c38..5858d53 100644 --- a/Tests/CodexLongTests/DownloadConnectivityTests/LongFullyConnectedDownloadTests.cs +++ b/Tests/CodexLongTests/DownloadConnectivityTests/LongFullyConnectedDownloadTests.cs @@ -1,8 +1,9 @@ using DistTestCore; using NUnit.Framework; +using Tests; using Utils; -namespace TestsLong.DownloadConnectivityTests +namespace CodexLongTests.DownloadConnectivityTests { [TestFixture] public class LongFullyConnectedDownloadTests : AutoBootstrapDistTest @@ -14,7 +15,7 @@ namespace TestsLong.DownloadConnectivityTests [Values(10, 15, 20)] int numberOfNodes, [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()); } diff --git a/Tests/CodexLongTests/Parallelism.cs b/Tests/CodexLongTests/Parallelism.cs index f45d8f2..51709b8 100644 --- a/Tests/CodexLongTests/Parallelism.cs +++ b/Tests/CodexLongTests/Parallelism.cs @@ -1,6 +1,6 @@ using NUnit.Framework; [assembly: LevelOfParallelism(1)] -namespace Tests +namespace CodexLongTests { } diff --git a/Tests/CodexTests/CodexTests.csproj b/Tests/CodexTests/CodexTests.csproj index e6faada..2c04d03 100644 --- a/Tests/CodexTests/CodexTests.csproj +++ b/Tests/CodexTests/CodexTests.csproj @@ -13,11 +13,11 @@ - - + + + + - - diff --git a/Tests/DistTestCore/DistTestCore.csproj b/Tests/DistTestCore/DistTestCore.csproj index 69da090..6a77277 100644 --- a/Tests/DistTestCore/DistTestCore.csproj +++ b/Tests/DistTestCore/DistTestCore.csproj @@ -19,10 +19,7 @@ - - - - - + +