From 3dfe9190b05b68497478324a776c1f80d6f5e56d Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Sat, 16 Nov 2019 10:21:39 -0800 Subject: [PATCH] integrations: fix dropped errors in TestCreateOrUpdateRepoFileForUpdateWithFileMove() (#9040) integrations: fix dropped error in lfsCommitAndPushTest() --- integrations/git_test.go | 1 + integrations/repofiles_update_test.go | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/integrations/git_test.go b/integrations/git_test.go index dbcc26522765..c0e1d7d2841a 100644 --- a/integrations/git_test.go +++ b/integrations/git_test.go @@ -162,6 +162,7 @@ func lfsCommitAndPushTest(t *testing.T, dstPath string) (littleLFS, bigLFS strin }, Message: fmt.Sprintf("Testing commit @ %v", time.Now()), }) + assert.NoError(t, err) git.GlobalCommandArgs = oldGlobals littleLFS, bigLFS = commitAndPushTest(t, dstPath, prefix) diff --git a/integrations/repofiles_update_test.go b/integrations/repofiles_update_test.go index 35cb5e8b0cb1..a7beec49553b 100644 --- a/integrations/repofiles_update_test.go +++ b/integrations/repofiles_update_test.go @@ -277,7 +277,14 @@ func TestCreateOrUpdateRepoFileForUpdateWithFileMove(t *testing.T) { expectedFileResponse := getExpectedFileResponseForRepofilesUpdate(commit.ID.String(), opts.TreePath) // assert that the old file no longer exists in the last commit of the branch fromEntry, err := commit.GetTreeEntryByPath(opts.FromTreePath) + switch err.(type) { + case git.ErrNotExist: + // correct, continue + default: + t.Fatalf("expected git.ErrNotExist, got:%v", err) + } toEntry, err := commit.GetTreeEntryByPath(opts.TreePath) + assert.Nil(t, err) assert.Nil(t, fromEntry) // Should no longer exist here assert.NotNil(t, toEntry) // Should exist here // assert SHA has remained the same but paths use the new file name