From 00eae6a26b047fda145085f51fa29fe3f179562e Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Thu, 1 Nov 2018 16:01:24 -0400 Subject: [PATCH] Fix conflicts --- api4/brand_test.go | 2 +- api4/post_test.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api4/brand_test.go b/api4/brand_test.go index 4d627f9441..b05e31e61b 100644 --- a/api4/brand_test.go +++ b/api4/brand_test.go @@ -59,7 +59,7 @@ func TestDeleteBrandImage(t *testing.T) { th := Setup().InitBasic().InitSystemAdmin() defer th.TearDown() - data, err := readTestFile("test.png") + data, err := testutils.ReadTestFile("test.png") if err != nil { t.Fatal(err) } diff --git a/api4/post_test.go b/api4/post_test.go index 7cac2e18a1..4396ce627c 100644 --- a/api4/post_test.go +++ b/api4/post_test.go @@ -20,6 +20,7 @@ import ( "github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" + "github.com/mattermost/mattermost-server/utils/testutils" ) func TestCreatePost(t *testing.T) { @@ -1681,7 +1682,7 @@ func TestGetFileInfosForPost(t *testing.T) { Client := th.Client fileIds := make([]string, 3) - if data, err := readTestFile("test.png"); err != nil { + if data, err := testutils.ReadTestFile("test.png"); err != nil { t.Fatal(err) } else { for i := 0; i < 3; i++ {