From c4a65643c0f05b87e1c1618cfea6f7c7949db01b Mon Sep 17 00:00:00 2001 From: Jacob Lauzon Date: Fri, 18 Oct 2024 13:12:56 -0700 Subject: [PATCH 1/4] Record some tests --- .../assets.json | 2 +- .../tests/ProgressHandlerTests.cs | 13 ++----------- .../assets.json | 2 +- .../StartTransferDirectoryCopyTestBase.cs | 17 ----------------- .../StartTransferDirectoryDownloadTestBase.cs | 14 -------------- 5 files changed, 4 insertions(+), 44 deletions(-) diff --git a/sdk/storage/Azure.Storage.DataMovement.Blobs/assets.json b/sdk/storage/Azure.Storage.DataMovement.Blobs/assets.json index 9c88148705748..2cbb4b1c6b036 100644 --- a/sdk/storage/Azure.Storage.DataMovement.Blobs/assets.json +++ b/sdk/storage/Azure.Storage.DataMovement.Blobs/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/storage/Azure.Storage.DataMovement.Blobs", - "Tag": "net/storage/Azure.Storage.DataMovement.Blobs_e796f456ff" + "Tag": "net/storage/Azure.Storage.DataMovement.Blobs_c66f15b319" } diff --git a/sdk/storage/Azure.Storage.DataMovement.Blobs/tests/ProgressHandlerTests.cs b/sdk/storage/Azure.Storage.DataMovement.Blobs/tests/ProgressHandlerTests.cs index d411013975083..f8d60e2a675fd 100644 --- a/sdk/storage/Azure.Storage.DataMovement.Blobs/tests/ProgressHandlerTests.cs +++ b/sdk/storage/Azure.Storage.DataMovement.Blobs/tests/ProgressHandlerTests.cs @@ -8,15 +8,12 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Azure.Core.TestFramework; -using Azure.Storage.Blobs.Tests; -using Azure.Storage.DataMovement.Blobs.Tests; +using Azure.Storage.DataMovement.Tests; using BaseBlobs::Azure.Storage.Blobs; -using BaseBlobs::Azure.Storage.Blobs.Models; using DMBlobs::Azure.Storage.DataMovement.Blobs; using NUnit.Framework; -namespace Azure.Storage.DataMovement.Tests +namespace Azure.Storage.DataMovement.Blobs.Tests { public class ProgressHandlerTests : DataMovementBlobTestBase { @@ -144,7 +141,6 @@ private async Task TransferAndAssertProgress( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task ProgressHandler_DownloadDirectory() { // Arrange @@ -167,7 +163,6 @@ await TransferAndAssertProgress( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task ProgressHandler_DirectoryUpload() { // Arrange @@ -190,7 +185,6 @@ await TransferAndAssertProgress( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task ProgressHandler_Copy() { // Arrange @@ -214,7 +208,6 @@ await TransferAndAssertProgress( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 [TestCase(StorageResourceCreationPreference.SkipIfExists)] [TestCase(StorageResourceCreationPreference.FailIfExists)] public async Task ProgressHandler_Conflict(StorageResourceCreationPreference createMode) @@ -246,7 +239,6 @@ await TransferAndAssertProgress( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 [TestCase(TransferDirection.Upload)] [TestCase(TransferDirection.Download)] [TestCase(TransferDirection.Copy)] @@ -308,7 +300,6 @@ await TransferAndAssertProgress( [Ignore("https://github.com/Azure/azure-sdk-for-net/issues/35558")] [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 [TestCase(0)] [TestCase(150)] public async Task ProgressHandler_PauseResume(int delayInMs) diff --git a/sdk/storage/Azure.Storage.DataMovement.Files.Shares/assets.json b/sdk/storage/Azure.Storage.DataMovement.Files.Shares/assets.json index eca0e432371b6..0a896e6743882 100644 --- a/sdk/storage/Azure.Storage.DataMovement.Files.Shares/assets.json +++ b/sdk/storage/Azure.Storage.DataMovement.Files.Shares/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/storage/Azure.Storage.DataMovement.Files.Shares", - "Tag": "net/storage/Azure.Storage.DataMovement.Files.Shares_4eaa88bc73" + "Tag": "net/storage/Azure.Storage.DataMovement.Files.Shares_44f04e1278" } diff --git a/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryCopyTestBase.cs b/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryCopyTestBase.cs index 4d6391923c9e8..cc9f3fdcfdc00 100644 --- a/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryCopyTestBase.cs +++ b/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryCopyTestBase.cs @@ -8,7 +8,6 @@ using System.Threading.Tasks; using Azure.Core; using Azure.Core.TestFramework; -using Azure.Storage.Common; using Azure.Storage.Test.Shared; using NUnit.Framework; @@ -276,7 +275,6 @@ await VerifyResultsAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 [TestCase(0, 10)] [TestCase(DataMovementTestConstants.KB / 2, 10)] [TestCase(DataMovementTestConstants.KB, 10)] @@ -357,7 +355,6 @@ await CopyDirectoryAndVerifyAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task DirectoryToDirectory_EmptyFolder() { // Arrange @@ -398,7 +395,6 @@ await TestTransferWithTimeout.WaitForCompletionAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task DirectoryToDirectory_SingleFile() { // Arrange @@ -423,7 +419,6 @@ await CopyDirectoryAndVerifyAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task DirectoryToDirectory_ManySubDirectories() { // Arrange @@ -458,7 +453,6 @@ await CopyDirectoryAndVerifyAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 [TestCase(1)] [TestCase(2)] [TestCase(3)] @@ -493,7 +487,6 @@ await CopyDirectoryAndVerifyAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task DirectoryToDirectory_OverwriteExists() { // Arrange @@ -543,7 +536,6 @@ await CopyDirectoryAndVerifyAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task DirectoryToDirectory_OverwriteNotExists() { // Arrange @@ -589,7 +581,6 @@ await CopyDirectoryAndVerifyAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public virtual async Task DirectoryToDirectory_OAuth() { // Arrange @@ -698,7 +689,6 @@ private async Task CreateStartTransfer( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task StartTransfer_AwaitCompletion() { // Arrange @@ -729,7 +719,6 @@ await TestTransferWithTimeout.WaitForCompletionAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task StartTransfer_AwaitCompletion_Failed() { // Arrange @@ -767,7 +756,6 @@ await TestTransferWithTimeout.WaitForCompletionAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task StartTransfer_AwaitCompletion_Skipped() { // Arrange @@ -805,7 +793,6 @@ await TestTransferWithTimeout.WaitForCompletionAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task StartTransfer_EnsureCompleted() { // Arrange @@ -837,7 +824,6 @@ public async Task StartTransfer_EnsureCompleted() } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task StartTransfer_EnsureCompleted_Failed() { // Arrange @@ -875,7 +861,6 @@ public async Task StartTransfer_EnsureCompleted_Failed() } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task StartTransfer_EnsureCompleted_Skipped() { // Arrange @@ -913,7 +898,6 @@ public async Task StartTransfer_EnsureCompleted_Skipped() } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task StartTransfer_EnsureCompleted_Failed_SmallChunks() { // Arrange @@ -1025,7 +1009,6 @@ await VerifyResultsAsync( [TestCase((int) TransferPropertiesTestType.Preserve)] [TestCase((int) TransferPropertiesTestType.NoPreserve)] [TestCase((int) TransferPropertiesTestType.NewProperties)] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task CopyRemoteObjects_VerifyProperties(int propertiesType) { // Arrange diff --git a/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryDownloadTestBase.cs b/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryDownloadTestBase.cs index 29a92c18fbafa..cdd13fc888812 100644 --- a/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryDownloadTestBase.cs +++ b/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryDownloadTestBase.cs @@ -170,7 +170,6 @@ private async Task DownloadDirectoryAndVerifyAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 [TestCase(0, 10)] [TestCase(100, 10)] [TestCase(Constants.KB, 10)] @@ -228,7 +227,6 @@ await DownloadDirectoryAndVerifyAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task DownloadDirectoryAsync_Empty() { // Arrange @@ -266,7 +264,6 @@ await TestTransferWithTimeout.WaitForCompletionAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task DownloadDirectoryAsync_SingleFile() { // Arrange @@ -280,7 +277,6 @@ await DownloadDirectoryAndVerifyAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task DownloadDirectoryAsync_ManySubDirectories() { // Arrange @@ -304,7 +300,6 @@ await DownloadDirectoryAndVerifyAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 [TestCase(1)] [TestCase(2)] [TestCase(3)] @@ -332,7 +327,6 @@ await DownloadDirectoryAndVerifyAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task DownloadDirectoryAsync_SmallChunks_ManyFiles() { // Arrange @@ -379,7 +373,6 @@ await DownloadDirectoryAndVerifyAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task DownloadDirectoryAsync_Root() { // Arrange @@ -450,7 +443,6 @@ private async Task CreateStartTransfer( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task StartTransfer_AwaitCompletion() { // Arrange @@ -483,7 +475,6 @@ await TestTransferWithTimeout.WaitForCompletionAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task StartTransfer_AwaitCompletion_Failed() { // Arrange @@ -525,7 +516,6 @@ await TestTransferWithTimeout.WaitForCompletionAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task StartTransfer_AwaitCompletion_Skipped() { // Arrange @@ -567,7 +557,6 @@ await TestTransferWithTimeout.WaitForCompletionAsync( } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task StartTransfer_EnsureCompleted() { // Arrange @@ -601,7 +590,6 @@ public async Task StartTransfer_EnsureCompleted() } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task StartTransfer_EnsureCompleted_Failed() { // Arrange @@ -643,7 +631,6 @@ public async Task StartTransfer_EnsureCompleted_Failed() } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task StartTransfer_EnsureCompleted_Skipped() { // Arrange @@ -685,7 +672,6 @@ public async Task StartTransfer_EnsureCompleted_Skipped() } [Test] - [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/33082 public async Task StartTransfer_EnsureCompleted_Failed_SmallChunks() { // Arrange From 221167c8c27a001be5e6372a724b50a40bb6a8cc Mon Sep 17 00:00:00 2001 From: Jacob Lauzon Date: Fri, 18 Oct 2024 15:37:45 -0700 Subject: [PATCH 2/4] Mark expected failure tests as LiveOnly again for now --- eng/nunit.runsettings | 2 +- .../tests/Shared/StartTransferDirectoryCopyTestBase.cs | 3 +++ .../tests/Shared/StartTransferDirectoryDownloadTestBase.cs | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/eng/nunit.runsettings b/eng/nunit.runsettings index 82f0cc6febb10..8e0fd05642e6f 100644 --- a/eng/nunit.runsettings +++ b/eng/nunit.runsettings @@ -19,7 +19,7 @@ - + diff --git a/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryCopyTestBase.cs b/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryCopyTestBase.cs index cc9f3fdcfdc00..17e8c72deacc5 100644 --- a/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryCopyTestBase.cs +++ b/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryCopyTestBase.cs @@ -719,6 +719,7 @@ await TestTransferWithTimeout.WaitForCompletionAsync( } [Test] + [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/46717 public async Task StartTransfer_AwaitCompletion_Failed() { // Arrange @@ -824,6 +825,7 @@ public async Task StartTransfer_EnsureCompleted() } [Test] + [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/46717 public async Task StartTransfer_EnsureCompleted_Failed() { // Arrange @@ -898,6 +900,7 @@ public async Task StartTransfer_EnsureCompleted_Skipped() } [Test] + [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/46717 public async Task StartTransfer_EnsureCompleted_Failed_SmallChunks() { // Arrange diff --git a/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryDownloadTestBase.cs b/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryDownloadTestBase.cs index cdd13fc888812..b711993eec9c4 100644 --- a/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryDownloadTestBase.cs +++ b/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryDownloadTestBase.cs @@ -475,6 +475,7 @@ await TestTransferWithTimeout.WaitForCompletionAsync( } [Test] + [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/46717 public async Task StartTransfer_AwaitCompletion_Failed() { // Arrange @@ -590,6 +591,7 @@ public async Task StartTransfer_EnsureCompleted() } [Test] + [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/46717 public async Task StartTransfer_EnsureCompleted_Failed() { // Arrange @@ -672,6 +674,7 @@ public async Task StartTransfer_EnsureCompleted_Skipped() } [Test] + [LiveOnly] // https://github.com/Azure/azure-sdk-for-net/issues/46717 public async Task StartTransfer_EnsureCompleted_Failed_SmallChunks() { // Arrange From bea51c072d7f0564e66dc1b9c87c63830a0d5e16 Mon Sep 17 00:00:00 2001 From: Jacob Lauzon Date: Fri, 18 Oct 2024 15:39:09 -0700 Subject: [PATCH 3/4] Revert nunit --- eng/nunit.runsettings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/nunit.runsettings b/eng/nunit.runsettings index 8e0fd05642e6f..13b46d1b9ff9d 100644 --- a/eng/nunit.runsettings +++ b/eng/nunit.runsettings @@ -19,7 +19,7 @@ - + From 0284b37f254de97576d09e39882b3fc4b5962f1a Mon Sep 17 00:00:00 2001 From: Jacob Lauzon Date: Fri, 18 Oct 2024 15:39:53 -0700 Subject: [PATCH 4/4] Revert nunit again --- eng/nunit.runsettings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/nunit.runsettings b/eng/nunit.runsettings index 13b46d1b9ff9d..82f0cc6febb10 100644 --- a/eng/nunit.runsettings +++ b/eng/nunit.runsettings @@ -19,7 +19,7 @@ - +