diff --git a/.drone.yml b/.drone.yml index df2340a..5235a5f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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 create-user --username=test01 --password=test01 --email=test01@gitea.io --admin=true --must-change-password=false --access-token -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 web -c /tmp/conf/app.ini - name: testing diff --git a/Makefile b/Makefile index f0a5e05..ad589e9 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ help: .PHONY: clean clean: rm -r -f test - $(GO) clean -i ./... + cd gitea && $(GO) clean -i ./... .PHONY: fmt fmt: @@ -68,10 +68,10 @@ test-instance: echo "DB_TYPE = sqlite3" >> ${WORK_DIR}/test/conf/app.ini; \ echo "[repository]" >> ${WORK_DIR}/test/conf/app.ini; \ echo "ROOT = ${WORK_DIR}/test/data/" >> ${WORK_DIR}/test/conf/app.ini; \ - echo "[server]" >> /tmp/conf/app.ini; \ - echo "ROOT_URL = ${GITEA_SDK_TEST_URL}" >> /tmp/conf/app.ini; \ + 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 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 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 web -c ${WORK_DIR}/test/conf/app.ini .PHONY: bench diff --git a/gitea/admin_test.go b/gitea/admin_test.go index 739f988..a53ab2c 100644 --- a/gitea/admin_test.go +++ b/gitea/admin_test.go @@ -43,7 +43,7 @@ func TestAdminCronTasks(t *testing.T) { tasks, _, err := c.ListCronTasks(ListCronTaskOptions{}) assert.NoError(t, err) - assert.Len(t, tasks, 15) + assert.Len(t, tasks, 16) _, err = c.RunCronTasks(tasks[0].Name) assert.NoError(t, err) }