From 92b117f930a5d622e9e75a4f5091c6f471bdd6c8 Mon Sep 17 00:00:00 2001
From: Jason Song <i@wolfogre.com>
Date: Thu, 5 Jan 2023 17:23:13 +0800
Subject: [PATCH] test: fix import cycle in dbfs test
---
models/dbfs/dbfs_test.go | 7 -------
models/dbfs/main_test.go | 4 ----
2 files changed, 11 deletions(-)
diff --git a/models/dbfs/dbfs_test.go b/models/dbfs/dbfs_test.go
index 50b9d561a1..30aa6463c5 100644
--- a/models/dbfs/dbfs_test.go
+++ b/models/dbfs/dbfs_test.go
@@ -10,7 +10,6 @@ import (
"testing"
"code.gitea.io/gitea/models/db"
- "code.gitea.io/gitea/models/unittest"
"github.com/stretchr/testify/assert"
@@ -28,8 +27,6 @@ func changeDefaultFileBlockSize(n int64) (restore func()) {
func TestDbfsBasic(t *testing.T) {
defer changeDefaultFileBlockSize(4)()
- assert.NoError(t, unittest.PrepareTestDatabase())
-
// test basic write/read
f, err := OpenFile(db.DefaultContext, "test.txt", os.O_RDWR|os.O_CREATE)
assert.NoError(t, err)
@@ -121,8 +118,6 @@ func TestDbfsBasic(t *testing.T) {
func TestDbfsReadWrite(t *testing.T) {
defer changeDefaultFileBlockSize(4)()
- assert.NoError(t, unittest.PrepareTestDatabase())
-
f1, err := OpenFile(db.DefaultContext, "test.log", os.O_RDWR|os.O_CREATE)
assert.NoError(t, err)
defer f1.Close()
@@ -155,8 +150,6 @@ func TestDbfsReadWrite(t *testing.T) {
func TestDbfsSeekWrite(t *testing.T) {
defer changeDefaultFileBlockSize(4)()
- assert.NoError(t, unittest.PrepareTestDatabase())
-
f, err := OpenFile(db.DefaultContext, "test2.log", os.O_RDWR|os.O_CREATE)
assert.NoError(t, err)
defer f.Close()
diff --git a/models/dbfs/main_test.go b/models/dbfs/main_test.go
index bd0a38a881..7a820b2d83 100644
--- a/models/dbfs/main_test.go
+++ b/models/dbfs/main_test.go
@@ -9,10 +9,6 @@ import (
"code.gitea.io/gitea/models/unittest"
"code.gitea.io/gitea/modules/setting"
-
- _ "code.gitea.io/gitea/models"
- _ "code.gitea.io/gitea/models/repo"
- _ "code.gitea.io/gitea/models/user"
)
func init() {