Этот коммит содержится в:
Ben Schumacher
2021-07-12 20:05:36 +02:00
коммит произвёл Claudio Costa
родитель 953eebdef4
Коммит 97ccf0bdf6
472 изменённых файлов: 9126 добавлений и 9132 удалений

Просмотреть файл

@@ -66,10 +66,10 @@ func TestReadReplicaDisabledBasedOnLicense(t *testing.T) {
cfg.SetDefaults()
driverName := os.Getenv("MM_SQLSETTINGS_DRIVERNAME")
if driverName == "" {
driverName = model.DATABASE_DRIVER_POSTGRES
driverName = model.DatabaseDriverPostgres
}
dsn := ""
if driverName == model.DATABASE_DRIVER_POSTGRES {
if driverName == model.DatabaseDriverPostgres {
dsn = os.Getenv("TEST_DATABASE_POSTGRESQL_DSN")
} else {
dsn = os.Getenv("TEST_DATABASE_MYSQL_DSN")
@@ -172,9 +172,9 @@ func TestStartServerNoS3Bucket(t *testing.T) {
server.configStore = store
server.UpdateConfig(func(cfg *model.Config) {
cfg.FileSettings = model.FileSettings{
DriverName: model.NewString(model.IMAGE_DRIVER_S3),
AmazonS3AccessKeyId: model.NewString(model.MINIO_ACCESS_KEY),
AmazonS3SecretAccessKey: model.NewString(model.MINIO_SECRET_KEY),
DriverName: model.NewString(model.ImageDriverS3),
AmazonS3AccessKeyId: model.NewString(model.MinioAccessKey),
AmazonS3SecretAccessKey: model.NewString(model.MinioSecretKey),
AmazonS3Bucket: model.NewString("nosuchbucket"),
AmazonS3Endpoint: model.NewString(s3Endpoint),
AmazonS3Region: model.NewString(""),
@@ -707,7 +707,7 @@ func TestAdminAdvisor(t *testing.T) {
Username: "vader" + model.NewId(),
Password: "passwd1",
AuthService: "",
Roles: model.SYSTEM_ADMIN_ROLE_ID,
Roles: model.SystemAdminRoleId,
}
ruser, err := th.App.CreateUser(th.Context, &user)
assert.Nil(t, err, "User should be created")
@@ -716,7 +716,7 @@ func TestAdminAdvisor(t *testing.T) {
t.Run("Should notify admin of un-configured support email", func(t *testing.T) {
doCheckAdminSupportStatus(th.App, th.Context)
bot, err := th.App.GetUserByUsername(model.BOT_WARN_METRIC_BOT_USERNAME)
bot, err := th.App.GetUserByUsername(model.BotWarnMetricBotUsername)
assert.NotNil(t, bot, "Bot should have been created now")
assert.Nil(t, err, "No error should be generated")
@@ -731,7 +731,7 @@ func TestAdminAdvisor(t *testing.T) {
m.SupportSettings.SupportEmail = &email
})
bot, err := th.App.GetUserByUsername(model.BOT_WARN_METRIC_BOT_USERNAME)
bot, err := th.App.GetUserByUsername(model.BotWarnMetricBotUsername)
assert.NotNil(t, bot, "Bot should be already created")
assert.Nil(t, err, "No error should be generated")