go-gitea
/
gitea
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

disable gravatar in test (#32529) 

When running e2e tests on flaky networks, gravatar can cause a timeout
and test failures. Turn off, and populate avatars on e2e test suite run
to make them reliable.
This commit is contained in:
Rowan Bohde 2024-11-20 22:30:48 -06:00 коммит произвёл GitHub
Родитель d11f8d24b0
Коммит 9ac74a1a40
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
5 изменённых файлов: 89 добавлений и 92 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
models/fixtures/system_setting.yml
Просмотреть файл

@ -1,7 +1,7 @@
- -
id: 1 id: 1
setting_key: 'picture.disable_gravatar' setting_key: 'picture.disable_gravatar'
setting_value: 'false' setting_value: 'true'
version: 1 version: 1
created: 1653533198 created: 1653533198
updated: 1653533198 updated: 1653533198

165
models/fixtures/user.yml
Просмотреть файл

@ -23,9 +23,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar1 avatar: ""
avatar_email: user1@example.com avatar_email: user1@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -60,8 +60,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar2 avatar: ""
avatar_email: user2@example.com avatar_email: user2@example.com
# cause a random avatar to be generated when referenced for test purposes
use_custom_avatar: false use_custom_avatar: false
num_followers: 2 num_followers: 2
num_following: 1 num_following: 1
@ -97,9 +98,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar3 avatar: ""
avatar_email: org3@example.com avatar_email: org3@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -134,9 +135,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar4 avatar: ""
avatar_email: user4@example.com avatar_email: user4@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 1 num_following: 1
num_stars: 0 num_stars: 0
@ -171,9 +172,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: false allow_create_organization: false
prohibit_login: false prohibit_login: false
avatar: avatar5 avatar: ""
avatar_email: user5@example.com avatar_email: user5@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -208,9 +209,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar6 avatar: ""
avatar_email: org6@example.com avatar_email: org6@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -245,9 +246,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar7 avatar: ""
avatar_email: org7@example.com avatar_email: org7@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -282,9 +283,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar8 avatar: ""
avatar_email: user8@example.com avatar_email: user8@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 1 num_followers: 1
num_following: 1 num_following: 1
num_stars: 0 num_stars: 0
@ -319,9 +320,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar9 avatar: ""
avatar_email: user9@example.com avatar_email: user9@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -356,9 +357,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar10 avatar: ""
avatar_email: user10@example.com avatar_email: user10@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 2 num_stars: 2
@ -393,9 +394,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar11 avatar: ""
avatar_email: user11@example.com avatar_email: user11@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -430,9 +431,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar12 avatar: ""
avatar_email: user12@example.com avatar_email: user12@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -467,9 +468,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar13 avatar: ""
avatar_email: user13@example.com avatar_email: user13@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -504,9 +505,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar14 avatar: ""
avatar_email: user13@example.com avatar_email: user13@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -541,9 +542,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar15 avatar: ""
avatar_email: user15@example.com avatar_email: user15@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -578,9 +579,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar16 avatar: ""
avatar_email: user16@example.com avatar_email: user16@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -615,9 +616,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar17 avatar: ""
avatar_email: org17@example.com avatar_email: org17@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -652,9 +653,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar18 avatar: ""
avatar_email: user18@example.com avatar_email: user18@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -689,9 +690,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar19 avatar: ""
avatar_email: org19@example.com avatar_email: org19@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -726,9 +727,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar20 avatar: ""
avatar_email: user20@example.com avatar_email: user20@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -763,9 +764,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar21 avatar: ""
avatar_email: user21@example.com avatar_email: user21@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -800,9 +801,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar22 avatar: ""
avatar_email: limited_org@example.com avatar_email: limited_org@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -837,9 +838,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar23 avatar: ""
avatar_email: privated_org@example.com avatar_email: privated_org@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -874,9 +875,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar24 avatar: ""
avatar_email: user24@example.com avatar_email: user24@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -911,9 +912,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar25 avatar: ""
avatar_email: org25@example.com avatar_email: org25@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -948,9 +949,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar26 avatar: ""
avatar_email: org26@example.com avatar_email: org26@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -985,9 +986,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar27 avatar: ""
avatar_email: user27@example.com avatar_email: user27@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -1022,9 +1023,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar28 avatar: ""
avatar_email: user28@example.com avatar_email: user28@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -1059,9 +1060,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar29 avatar: ""
avatar_email: user29@example.com avatar_email: user29@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -1096,9 +1097,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar29 avatar: ""
avatar_email: user30@example.com avatar_email: user30@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -1133,9 +1134,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar31 avatar: ""
avatar_email: user31@example.com avatar_email: user31@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 1 num_following: 1
num_stars: 0 num_stars: 0
@ -1170,9 +1171,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar32 avatar: ""
avatar_email: user30@example.com avatar_email: user30@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -1207,9 +1208,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar33 avatar: ""
avatar_email: user33@example.com avatar_email: user33@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 1 num_followers: 1
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -1245,7 +1246,7 @@
allow_import_local: false allow_import_local: false
allow_create_organization: false allow_create_organization: false
prohibit_login: false prohibit_login: false
avatar: avatar34 avatar: ""
avatar_email: user34@example.com avatar_email: user34@example.com
use_custom_avatar: true use_custom_avatar: true
num_followers: 0 num_followers: 0
@ -1282,9 +1283,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar35 avatar: ""
avatar_email: private_org35@example.com avatar_email: private_org35@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -1319,9 +1320,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar22 avatar: ""
avatar_email: abcde@gitea.com avatar_email: abcde@gitea.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -1356,9 +1357,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: true prohibit_login: true
avatar: avatar29 avatar: ""
avatar_email: user37@example.com avatar_email: user37@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -1393,9 +1394,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar38 avatar: ""
avatar_email: user38@example.com avatar_email: user38@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -1430,9 +1431,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar39 avatar: ""
avatar_email: user39@example.com avatar_email: user39@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -1467,9 +1468,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar40 avatar: ""
avatar_email: user40@example.com avatar_email: user40@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -1504,9 +1505,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar41 avatar: ""
avatar_email: org41@example.com avatar_email: org41@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0
@ -1541,9 +1542,9 @@
allow_import_local: false allow_import_local: false
allow_create_organization: true allow_create_organization: true
prohibit_login: false prohibit_login: false
avatar: avatar42 avatar: ""
avatar_email: org42@example.com avatar_email: org42@example.com
use_custom_avatar: false use_custom_avatar: true
num_followers: 0 num_followers: 0
num_following: 0 num_following: 0
num_stars: 0 num_stars: 0

9
modules/repository/commits_test.go
Просмотреть файл

@ -4,8 +4,6 @@
package repository package repository
import ( import (
"crypto/md5"
"fmt"
"strconv" "strconv"
"testing" "testing"
"time" "time"
@ -125,15 +123,12 @@ func TestPushCommits_AvatarLink(t *testing.T) {
}, },
} }
setting.GravatarSource = "https://secure.gravatar.com/avatar"
setting.OfflineMode = true
assert.Equal(t, assert.Equal(t,
"/avatars/avatar2?size="+strconv.Itoa(28*setting.Avatar.RenderedSizeFactor), "/avatars/ab53a2911ddf9b4817ac01ddcd3d975f?size="+strconv.Itoa(28*setting.Avatar.RenderedSizeFactor),
pushCommits.AvatarLink(db.DefaultContext, "user2@example.com")) pushCommits.AvatarLink(db.DefaultContext, "user2@example.com"))
assert.Equal(t, assert.Equal(t,
fmt.Sprintf("https://secure.gravatar.com/avatar/%x?d=identicon&s=%d", md5.Sum([]byte("nonexistent@example.com")), 28*setting.Avatar.RenderedSizeFactor), "/assets/img/avatar_default.png",
pushCommits.AvatarLink(db.DefaultContext, "nonexistent@example.com")) pushCommits.AvatarLink(db.DefaultContext, "nonexistent@example.com"))
} }

3
services/repository/contributors_graph_test.go
Просмотреть файл

@ -18,6 +18,7 @@ import (
func TestRepository_ContributorsGraph(t *testing.T) { func TestRepository_ContributorsGraph(t *testing.T) {
assert.NoError(t, unittest.PrepareTestDatabase()) assert.NoError(t, unittest.PrepareTestDatabase())
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2}) repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
assert.NoError(t, repo.LoadOwner(db.DefaultContext)) assert.NoError(t, repo.LoadOwner(db.DefaultContext))
mockCache, err := cache.NewStringCache(setting.Cache{}) mockCache, err := cache.NewStringCache(setting.Cache{})
@ -46,7 +47,7 @@ func TestRepository_ContributorsGraph(t *testing.T) {
assert.EqualValues(t, &ContributorData{ assert.EqualValues(t, &ContributorData{
Name: "Ethan Koenig", Name: "Ethan Koenig",
AvatarLink: "https://secure.gravatar.com/avatar/b42fb195faa8c61b8d88abfefe30e9e3?d=identicon", AvatarLink: "/assets/img/avatar_default.png",
TotalCommits: 1, TotalCommits: 1,
Weeks: map[int64]*WeekData{ Weeks: map[int64]*WeekData{
1511654400000: { 1511654400000: {

2
tests/e2e/e2e_test.go
Просмотреть файл

@ -107,7 +107,7 @@ func TestE2e(t *testing.T) {
cmd.Stdout = &stdout cmd.Stdout = &stdout
cmd.Stderr = &stderr cmd.Stderr = &stderr
err := cmd.Run() err = cmd.Run()
if err != nil { if err != nil {
// Currently colored output is conflicting. Using Printf until that is resolved. // Currently colored output is conflicting. Using Printf until that is resolved.
fmt.Printf("%v", stdout.String()) fmt.Printf("%v", stdout.String())