Skip to content

Commit c39fee4

Browse files
committed
Only sanity-check when necessary
1 parent 4eddd42 commit c39fee4

File tree

1 file changed

+18
-14
lines changed

1 file changed

+18
-14
lines changed

e2etest/scenario_helpers.go

+18-14
Original file line numberDiff line numberDiff line change
@@ -686,16 +686,18 @@ func (scenarioHelper) generateAzureFilesFromList(c asserter, options *generateAz
686686
_, err := dir.SetProperties(ctx, ad.toHeaders(c, options.shareURL).SMBProperties)
687687
c.AssertNoErr(err)
688688

689-
prop, err := dir.GetProperties(ctx)
690-
c.AssertNoErr(err)
689+
if f.creationProperties.smbPermissionsSddl != nil {
690+
prop, err := dir.GetProperties(ctx)
691+
c.AssertNoErr(err)
691692

692-
perm, err := options.shareURL.GetPermission(ctx, prop.FilePermissionKey())
693-
c.AssertNoErr(err)
693+
perm, err := options.shareURL.GetPermission(ctx, prop.FilePermissionKey())
694+
c.AssertNoErr(err)
694695

695-
dest, _ := sddl.ParseSDDL(perm.Permission)
696-
source, _ := sddl.ParseSDDL(*f.creationProperties.smbPermissionsSddl)
696+
dest, _ := sddl.ParseSDDL(perm.Permission)
697+
source, _ := sddl.ParseSDDL(*f.creationProperties.smbPermissionsSddl)
697698

698-
c.Assert(dest.Compare(source), equals(), true)
699+
c.Assert(dest.Compare(source), equals(), true)
700+
}
699701
}
700702

701703
// set other properties
@@ -749,16 +751,18 @@ func (scenarioHelper) generateAzureFilesFromList(c asserter, options *generateAz
749751
_, err := file.SetHTTPHeaders(ctx, headers)
750752
c.AssertNoErr(err)
751753

752-
prop, err := file.GetProperties(ctx)
753-
c.AssertNoErr(err)
754+
if f.creationProperties.smbPermissionsSddl != nil {
755+
prop, err := file.GetProperties(ctx)
756+
c.AssertNoErr(err)
754757

755-
perm, err := options.shareURL.GetPermission(ctx, prop.FilePermissionKey())
756-
c.AssertNoErr(err)
758+
perm, err := options.shareURL.GetPermission(ctx, prop.FilePermissionKey())
759+
c.AssertNoErr(err)
757760

758-
dest, _ := sddl.ParseSDDL(perm.Permission)
759-
source, _ := sddl.ParseSDDL(*f.creationProperties.smbPermissionsSddl)
761+
dest, _ := sddl.ParseSDDL(perm.Permission)
762+
source, _ := sddl.ParseSDDL(*f.creationProperties.smbPermissionsSddl)
760763

761-
c.Assert(dest.Compare(source), equals(), true)
764+
c.Assert(dest.Compare(source), equals(), true)
765+
}
762766
}
763767

764768
_, err = file.UploadRange(context.Background(), 0, contentR, nil)

0 commit comments

Comments
 (0)