From bb7eb0faacb77436a492d4b9b9775f2771a546d7 Mon Sep 17 00:00:00 2001 From: Stefan Majewsky Date: Wed, 30 May 2018 11:38:52 +0200 Subject: adjust semantics of Object.InspectSymlink, rename to Object.SymlinkHeaders The additional guarantee that Object.SymlinkHeaders becomes equivalent to Object.Headers for non-symlinks will be useful e.g. for swift-http-import's usecase. --- tests/object_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/object_test.go b/tests/object_test.go index 618c835..15aa8f2 100644 --- a/tests/object_test.go +++ b/tests/object_test.go @@ -277,21 +277,21 @@ func expectObjectContent(t *testing.T, obj *schwift.Object, expected []byte) { func expectObjectSymlink(t *testing.T, source, expectedTarget *schwift.Object) { t.Helper() - target, _, err := source.InspectSymlink() + _, target, err := source.SymlinkHeaders() if expectedTarget == nil { switch err { - case schwift.ErrNotASymlink: - return //success case nil: - t.Errorf("expected %s to not be a symlink, but found symlink to %s\n", - source.FullName(), target.FullName()) + if target != nil { + t.Errorf("expected %s to not be a symlink, but found symlink to %s\n", + source.FullName(), target.FullName()) + } default: - t.Errorf("got unexpected error from Object.SymlinkTarget() for %s: %s\n", + t.Errorf("got unexpected error from Object.SymlinkHeaders() for %s: %s\n", source.FullName(), err.Error()) } } else { if err != nil { - t.Errorf("expected %s to be a symlink to %s, but Object.SymlinkTarget() returned error: %s\n", + t.Errorf("expected %s to be a symlink to %s, but Object.SymlinkHeaders() returned error: %s\n", source.FullName(), expectedTarget.FullName(), err.Error()) } else if target.FullName() != expectedTarget.FullName() { t.Errorf("expected %s to be a symlink to %s, but got target %s\n", -- cgit v1.2.3