From 063d97fe74a94fd3c2c2a7452e45cb2b85805f3a Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 30 Jan 2021 21:25:21 +0800 Subject: [PATCH] Update Test Data (#480) let the test PASS again Reviewed-on: https://gitea.com/gitea/go-sdk/pulls/480 Reviewed-by: Lunny Xiao Reviewed-by: Andrew Thornton Co-authored-by: 6543 <6543@obermui.de> Co-committed-by: 6543 <6543@obermui.de> --- gitea/admin_test.go | 8 +++++--- gitea/notifications_test.go | 1 + gitea/pull_test.go | 2 +- gitea/repo_test.go | 6 +++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gitea/admin_test.go b/gitea/admin_test.go index a53ab2c..366f0e3 100644 --- a/gitea/admin_test.go +++ b/gitea/admin_test.go @@ -30,8 +30,10 @@ func TestAdminOrg(t *testing.T) { orgs, _, err := c.AdminListOrgs(AdminListOrgsOptions{}) assert.NoError(t, err) - assert.Len(t, orgs, 1) - assert.EqualValues(t, newOrg.ID, orgs[0].ID) + if assert.True(t, len(orgs) >= 1) { + orgs = orgs[len(orgs)-1:] + assert.EqualValues(t, newOrg.ID, orgs[0].ID) + } _, err = c.DeleteOrg(orgName) assert.NoError(t, err) @@ -43,7 +45,7 @@ func TestAdminCronTasks(t *testing.T) { tasks, _, err := c.ListCronTasks(ListCronTaskOptions{}) assert.NoError(t, err) - assert.Len(t, tasks, 16) + assert.Len(t, tasks, 17) _, err = c.RunCronTasks(tasks[0].Name) assert.NoError(t, err) } diff --git a/gitea/notifications_test.go b/gitea/notifications_test.go index 93ce2a7..da61df4 100644 --- a/gitea/notifications_test.go +++ b/gitea/notifications_test.go @@ -113,6 +113,7 @@ func TestNotifications(t *testing.T) { c.sudo = "" _, err = c.ReadNotifications(MarkNotificationOptions{}) assert.NoError(t, err) + _, _ = c.DeleteRepo("test01", "Reviews") nList, _, err = c.ListNotifications(ListNotificationOptions{Status: []NotifyStatus{NotifyStatusRead}}) assert.NoError(t, err) assert.Len(t, nList, 4) diff --git a/gitea/pull_test.go b/gitea/pull_test.go index 75c5145..a52ddf8 100644 --- a/gitea/pull_test.go +++ b/gitea/pull_test.go @@ -58,7 +58,7 @@ func TestPull(t *testing.T) { diff, _, err := c.GetPullRequestDiff(c.username, repoName, pullUpdateFile.Index) assert.NoError(t, err) - assert.Len(t, diff, 1310) + assert.Len(t, diff, 1281) patch, _, err := c.GetPullRequestPatch(c.username, repoName, pullUpdateFile.Index) assert.NoError(t, err) assert.True(t, len(patch) > len(diff)) diff --git a/gitea/repo_test.go b/gitea/repo_test.go index 6300207..3e924a7 100644 --- a/gitea/repo_test.go +++ b/gitea/repo_test.go @@ -138,7 +138,7 @@ func TestGetArchive(t *testing.T) { time.Sleep(time.Second / 2) archive, _, err := c.GetArchive(repo.Owner.UserName, repo.Name, "master", ZipArchive) assert.NoError(t, err) - assert.EqualValues(t, 1620, len(archive)) + assert.EqualValues(t, 1602, len(archive)) } func TestGetArchiveReader(t *testing.T) { @@ -153,8 +153,8 @@ func TestGetArchiveReader(t *testing.T) { archive := bytes.NewBuffer(nil) nBytes, err := io.Copy(archive, r) assert.NoError(t, err) - assert.EqualValues(t, 1620, nBytes) - assert.EqualValues(t, 1620, len(archive.Bytes())) + assert.EqualValues(t, 1602, nBytes) + assert.EqualValues(t, nBytes, len(archive.Bytes())) } // standard func to create a init repo for test routines