From 0b9c582a8a594b3c21f20b439d1176f22cb4584b Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 23 Mar 2021 18:11:24 +0800 Subject: [PATCH] Test against gitea 1.13.x (#505) as title Reviewed-on: https://gitea.com/gitea/go-sdk/pulls/505 Reviewed-by: Lunny Xiao Reviewed-by: Norwin Co-authored-by: 6543 <6543@obermui.de> Co-committed-by: 6543 <6543@obermui.de> --- .drone.yml | 4 ++-- Makefile | 4 ++-- gitea/admin_test.go | 2 +- gitea/pull_test.go | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5235a5f..3dc2b38 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,7 @@ workspace: steps: - name: gitea - image: gitea/gitea:latest + image: gitea/gitea:1.13 detach: true commands: - mkdir -p /tmp/conf/ @@ -29,7 +29,7 @@ steps: - echo "[server]" >> /tmp/conf/app.ini - echo "ROOT_URL = http://gitea:3000" >> /tmp/conf/app.ini - gitea migrate -c /tmp/conf/app.ini - - gitea admin user create --username=test01 --password=test01 --email=test01@gitea.io --admin=true --must-change-password=false --access-token -c /tmp/conf/app.ini + - gitea admin create-user --username=test01 --password=test01 --email=test01@gitea.io --admin=true --must-change-password=false --access-token -c /tmp/conf/app.ini - gitea web -c /tmp/conf/app.ini - name: testing diff --git a/Makefile b/Makefile index ad589e9..291d58e 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ test: test-instance: rm -f -r ${WORK_DIR}/test 2> /dev/null; \ mkdir -p ${WORK_DIR}/test/conf/ ${WORK_DIR}/test/data/ - wget "https://dl.gitea.io/gitea/master/gitea-master-linux-amd64" -O ${WORK_DIR}/test/gitea-master; \ + wget "https://dl.gitea.io/gitea/1.13/gitea-1.13-linux-amd64" -O ${WORK_DIR}/test/gitea-master; \ chmod +x ${WORK_DIR}/test/gitea-master; \ echo "[security]" > ${WORK_DIR}/test/conf/app.ini; \ echo "INTERNAL_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE1NTg4MzY4ODB9.LoKQyK5TN_0kMJFVHWUW0uDAyoGjDP6Mkup4ps2VJN4" >> ${WORK_DIR}/test/conf/app.ini; \ @@ -71,7 +71,7 @@ test-instance: echo "[server]" >> ${WORK_DIR}/test/conf/app.ini; \ echo "ROOT_URL = ${GITEA_SDK_TEST_URL}" >> ${WORK_DIR}/test/conf/app.ini; \ ${WORK_DIR}/test/gitea-master migrate -c ${WORK_DIR}/test/conf/app.ini; \ - ${WORK_DIR}/test/gitea-master admin user create --username=${GITEA_SDK_TEST_USERNAME} --password=${GITEA_SDK_TEST_PASSWORD} --email=test01@gitea.io --admin=true --must-change-password=false --access-token -c ${WORK_DIR}/test/conf/app.ini; \ + ${WORK_DIR}/test/gitea-master admin create-user --username=${GITEA_SDK_TEST_USERNAME} --password=${GITEA_SDK_TEST_PASSWORD} --email=test01@gitea.io --admin=true --must-change-password=false --access-token -c ${WORK_DIR}/test/conf/app.ini; \ ${WORK_DIR}/test/gitea-master web -c ${WORK_DIR}/test/conf/app.ini .PHONY: bench diff --git a/gitea/admin_test.go b/gitea/admin_test.go index 366f0e3..0e05280 100644 --- a/gitea/admin_test.go +++ b/gitea/admin_test.go @@ -45,7 +45,7 @@ func TestAdminCronTasks(t *testing.T) { tasks, _, err := c.ListCronTasks(ListCronTaskOptions{}) assert.NoError(t, err) - assert.Len(t, tasks, 17) + assert.Len(t, tasks, 16) _, err = c.RunCronTasks(tasks[0].Name) assert.NoError(t, err) } diff --git a/gitea/pull_test.go b/gitea/pull_test.go index 83e325a..6f6bd01 100644 --- a/gitea/pull_test.go +++ b/gitea/pull_test.go @@ -58,10 +58,10 @@ func TestPull(t *testing.T) { diff, _, err := c.GetPullRequestDiff(c.username, repoName, pullUpdateFile.Index) assert.NoError(t, err) - assert.True(t, len(diff) > 1100 && len(diff) < 1300) + assert.Len(t, diff, 1310) patch, _, err := c.GetPullRequestPatch(c.username, repoName, pullUpdateFile.Index) assert.NoError(t, err) - assert.True(t, len(patch) > len(diff)) + assert.Len(t, patch, 1582) // test Update pull pr, _, err := c.GetPullRequest(user.UserName, repoName, pullUpdateFile.Index)