Skip to content

Commit 4739d3a

Browse files
committed
Use HNS acct with BlobFS location
1 parent ad7abef commit 4739d3a

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

e2etest/declarativeRunner.go

+10
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,16 @@ func RunScenarios(
167167
subtestName += "-" + scenarioSuffix
168168
}
169169

170+
if fromTo.From() == common.ELocation.BlobFS() {
171+
// switch to an account made for dfs
172+
srcAccountType = EAccountType.HierarchicalNamespaceEnabled()
173+
}
174+
175+
if fromTo.To() == common.ELocation.BlobFS() {
176+
// switch to an account made for dfs
177+
destAccountType = EAccountType.HierarchicalNamespaceEnabled()
178+
}
179+
170180
s := scenario{
171181
srcAccountType: srcAccountType,
172182
destAccountType: destAccountType,

e2etest/declarativeScenario.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func (s *scenario) Run() {
108108
s.a.Assert(true, equals(), s.fromTo.From() == common.ELocation.Blob() || s.fromTo.From() == common.ELocation.BlobFS())
109109
}
110110

111-
if s.destAccountType.IsBlobOnly() {
111+
if s.destAccountType.IsManagedDisk() {
112112
s.a.Assert(s.destAccountType, notEquals(), EAccountType.StdManagedDisk(), "Upload is not supported in MD testing yet")
113113
s.a.Assert(s.destAccountType, notEquals(), EAccountType.OAuthManagedDisk(), "Upload is not supported in MD testing yet")
114114
s.a.Assert(true, equals(), s.fromTo.From() == common.ELocation.Blob() || s.fromTo.From() == common.ELocation.BlobFS())

e2etest/zt_remove_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ func TestRemove_IncludeAfter(t *testing.T) {
3939
folder("fold1"),
4040
f("fold1/fileb"),
4141
}
42-
RunScenarios(t, eOperation.Remove(), eTestFromTo.AllRemove(), eValidate.Auto(), anonymousAuthOnly, anonymousAuthOnly, params{
42+
// these filters aren't supported for blobFS
43+
RunScenarios(t, eOperation.Remove(), eTestFromTo.Other(common.EFromTo.BlobTrash(), common.EFromTo.FileTrash()), eValidate.Auto(), anonymousAuthOnly, anonymousAuthOnly, params{
4344
recursive: true,
4445
}, &hooks{
4546
beforeRunJob: func(h hookHelper) {

0 commit comments

Comments
 (0)