From ef597f6fe45cae8b3ba405ff89f5b20bfbf349e5 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Thu, 7 Dec 2017 15:56:14 -0500 Subject: PLT-8314: Test Message Export Against S3 Bucket (#7957) * Removed export directory config setting, in favour of hard-coding it to an 'export' directory under the local file directory. Improved the local file backend copy implementation to implicitly create the destination directory if it's missing * Fixed the tests --- model/config_test.go | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'model/config_test.go') diff --git a/model/config_test.go b/model/config_test.go index 217751252..ceede6be4 100644 --- a/model/config_test.go +++ b/model/config_test.go @@ -6,8 +6,6 @@ package model import ( "testing" - "os" - "github.com/stretchr/testify/require" ) @@ -100,34 +98,12 @@ func TestMessageExportSettingsIsValidBatchSizeInvalid(t *testing.T) { EnableExport: NewBool(true), ExportFromTimestamp: NewInt64(0), DailyRunTime: NewString("15:04"), - FileLocation: NewString("foo"), } // should fail fast because batch size isn't set require.Error(t, mes.isValid(*fs)) } -func TestMessageExportSettingsIsValidFileLocationInvalid(t *testing.T) { - fs := &FileSettings{} - mes := &MessageExportSettings{ - EnableExport: NewBool(true), - ExportFromTimestamp: NewInt64(0), - DailyRunTime: NewString("15:04"), - BatchSize: NewInt(100), - } - - // should fail fast because FileLocation isn't set - require.Error(t, mes.isValid(*fs)) - - // if using the local file driver, there are more rules for FileLocation - fs.DriverName = NewString(IMAGE_DRIVER_LOCAL) - fs.Directory, _ = os.Getwd() - mes.FileLocation = NewString("") - - // should fail fast because file location is not relative to basepath - require.Error(t, mes.isValid(*fs)) -} - func TestMessageExportSettingsIsValid(t *testing.T) { fs := &FileSettings{ DriverName: NewString("foo"), // bypass file location check @@ -136,7 +112,6 @@ func TestMessageExportSettingsIsValid(t *testing.T) { EnableExport: NewBool(true), ExportFromTimestamp: NewInt64(0), DailyRunTime: NewString("15:04"), - FileLocation: NewString("foo"), BatchSize: NewInt(100), } @@ -149,7 +124,6 @@ func TestMessageExportSetDefaults(t *testing.T) { mes.SetDefaults() require.False(t, *mes.EnableExport) - require.Equal(t, "export", *mes.FileLocation) require.Equal(t, "01:00", *mes.DailyRunTime) require.Equal(t, int64(0), *mes.ExportFromTimestamp) require.Equal(t, 10000, *mes.BatchSize) @@ -162,7 +136,6 @@ func TestMessageExportSetDefaultsExportEnabledExportFromTimestampNil(t *testing. mes.SetDefaults() require.True(t, *mes.EnableExport) - require.Equal(t, "export", *mes.FileLocation) require.Equal(t, "01:00", *mes.DailyRunTime) require.NotEqual(t, int64(0), *mes.ExportFromTimestamp) require.True(t, *mes.ExportFromTimestamp <= GetMillis()) @@ -177,7 +150,6 @@ func TestMessageExportSetDefaultsExportEnabledExportFromTimestampZero(t *testing mes.SetDefaults() require.True(t, *mes.EnableExport) - require.Equal(t, "export", *mes.FileLocation) require.Equal(t, "01:00", *mes.DailyRunTime) require.NotEqual(t, int64(0), *mes.ExportFromTimestamp) require.True(t, *mes.ExportFromTimestamp <= GetMillis()) @@ -192,7 +164,6 @@ func TestMessageExportSetDefaultsExportEnabledExportFromTimestampNonZero(t *test mes.SetDefaults() require.True(t, *mes.EnableExport) - require.Equal(t, "export", *mes.FileLocation) require.Equal(t, "01:00", *mes.DailyRunTime) require.Equal(t, int64(12345), *mes.ExportFromTimestamp) require.Equal(t, 10000, *mes.BatchSize) @@ -205,7 +176,6 @@ func TestMessageExportSetDefaultsExportDisabledExportFromTimestampNil(t *testing mes.SetDefaults() require.False(t, *mes.EnableExport) - require.Equal(t, "export", *mes.FileLocation) require.Equal(t, "01:00", *mes.DailyRunTime) require.Equal(t, int64(0), *mes.ExportFromTimestamp) require.Equal(t, 10000, *mes.BatchSize) @@ -219,7 +189,6 @@ func TestMessageExportSetDefaultsExportDisabledExportFromTimestampZero(t *testin mes.SetDefaults() require.False(t, *mes.EnableExport) - require.Equal(t, "export", *mes.FileLocation) require.Equal(t, "01:00", *mes.DailyRunTime) require.Equal(t, int64(0), *mes.ExportFromTimestamp) require.Equal(t, 10000, *mes.BatchSize) @@ -233,7 +202,6 @@ func TestMessageExportSetDefaultsExportDisabledExportFromTimestampNonZero(t *tes mes.SetDefaults() require.False(t, *mes.EnableExport) - require.Equal(t, "export", *mes.FileLocation) require.Equal(t, "01:00", *mes.DailyRunTime) require.Equal(t, int64(0), *mes.ExportFromTimestamp) require.Equal(t, 10000, *mes.BatchSize) -- cgit v1.2.3-1-g7c22