From 519069f97ffb2615ed66e996df0052d6c4d6112b Mon Sep 17 00:00:00 2001 From: benbierens Date: Thu, 8 Jun 2023 13:23:26 +0200 Subject: [PATCH] Cleanup --- DistTestCore/FileManager.cs | 10 ++++------ DistTestCore/Marketplace/MarketplaceAccessFactory.cs | 1 - DistTestCore/Timing.cs | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/DistTestCore/FileManager.cs b/DistTestCore/FileManager.cs index 69e0ef3..5ebae09 100644 --- a/DistTestCore/FileManager.cs +++ b/DistTestCore/FileManager.cs @@ -169,8 +169,9 @@ namespace DistTestCore public string Describe() { - if (!string.IsNullOrEmpty(Label)) return Label; - return $"'{Filename}' ({Formatter.FormatByteSize(GetFileSize())})"; + var sizePostfix = $" ({Formatter.FormatByteSize(GetFileSize())})"; + if (!string.IsNullOrEmpty(Label)) return Label + sizePostfix; + return $"'{Filename}'{sizePostfix}"; } private void AssertEqual(TestFile? actual) @@ -178,10 +179,7 @@ namespace DistTestCore if (actual == null) Assert.Fail("TestFile is null."); if (actual == this || actual!.Filename == Filename) Assert.Fail("TestFile is compared to itself."); - Stopwatch.Measure(log, "sizes", () => - { - Assert.That(actual.GetFileSize(), Is.EqualTo(GetFileSize()), "Files are not of equal length."); - }); + Assert.That(actual.GetFileSize(), Is.EqualTo(GetFileSize()), "Files are not of equal length."); using var streamExpected = new FileStream(Filename, FileMode.Open, FileAccess.Read); using var streamActual = new FileStream(actual.Filename, FileMode.Open, FileAccess.Read); diff --git a/DistTestCore/Marketplace/MarketplaceAccessFactory.cs b/DistTestCore/Marketplace/MarketplaceAccessFactory.cs index 5ad52eb..ac59556 100644 --- a/DistTestCore/Marketplace/MarketplaceAccessFactory.cs +++ b/DistTestCore/Marketplace/MarketplaceAccessFactory.cs @@ -1,5 +1,4 @@ using DistTestCore.Codex; -using Logging; namespace DistTestCore.Marketplace { diff --git a/DistTestCore/Timing.cs b/DistTestCore/Timing.cs index cff8b09..c395d07 100644 --- a/DistTestCore/Timing.cs +++ b/DistTestCore/Timing.cs @@ -31,7 +31,7 @@ namespace DistTestCore public TimeSpan HttpCallRetryDelay() { - return TimeSpan.FromSeconds(3); + return TimeSpan.FromSeconds(1); } public TimeSpan WaitForK8sServiceDelay() @@ -64,7 +64,7 @@ namespace DistTestCore public TimeSpan HttpCallRetryDelay() { - return TimeSpan.FromMinutes(5); + return TimeSpan.FromSeconds(2); } public TimeSpan WaitForK8sServiceDelay()