Target the correct destination account, stop checking tags on HNS

Azure · Oct 22, 2024 · 37fe232 · 37fe232
1 parent 3e10ab6
commit 37fe232
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/e2etest/newe2e_resource_managers_blob.go b/e2etest/newe2e_resource_managers_blob.go
@@ -682,9 +682,10 @@ func (b *BlobObjectResourceManager) GetPropertiesWithOptions(a Asserter, options
 			Type:      resp.BlobType,
 			Tags: func() map[string]string {
 				out := make(map[string]string)
-				if b.internalAccount.AccountType() == EAccountType.PremiumPageBlobs() {
+				if b.internalAccount.AccountType() == EAccountType.PremiumPageBlobs() || b.internalAccount.AccountType() == EAccountType.HierarchicalNamespaceEnabled() {
 					return out
 				}
+
 				resp, err := b.internalClient.GetTags(ctx, nil)
 				a.NoError("Get tags", err)
 				for _, tag := range resp.BlobTagSet {

diff --git a/e2etest/zt_newe2e_blobfs_test.go b/e2etest/zt_newe2e_blobfs_test.go
@@ -224,7 +224,7 @@ func (s *BlobFSTestSuite) Scenario_VirtualDirectoryHandling(svm *ScenarioVariati
 		GetRootResource(svm, ResolveVariation(svm, []common.Location{
 			common.ELocation.Blob(),
 			common.ELocation.BlobFS(),
-		})),
+		}), GetResourceOptions{PreferredAccount: targetAcct}),
 		ResourceDefinitionContainer{})
 
 	RunAzCopy(

diff --git a/e2etest/zt_newe2e_list_test.go b/e2etest/zt_newe2e_list_test.go
@@ -899,9 +899,5 @@ func (s *ListSuite) Scenario_VirtualDirectoryHandling(svm *ScenarioVariationMana
 		}
 	}
 
-	if !svm.Dryrun() {
-		svm.Log(stdout.String())
-	}
-
 	ValidateListOutput(svm, stdout, expectedObjects, nil) // No expected summary
 }