pkg/db/db.go

@@ -92,9 +92,17 @@ func CreateTestEngine() (engine *xorm.Engine, err error) {
 		return x, nil
 	}
 
-	engine, err = xorm.NewEngine("sqlite3", "file::memory:?cache=shared")
-	if err != nil {
-		return nil, err
+	if os.Getenv("VIKUNJA_TESTS_USE_CONFIG") == "1" {
+		config.InitConfig()
+		engine, err = CreateDBEngine()
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		engine, err = xorm.NewEngine("sqlite3", "file::memory:?cache=shared")
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	engine.SetMapper(core.GonicMapper{})

pkg/models/unit_tests.go

@@ -63,10 +63,9 @@ func createTestEngine(fixturesDir string) error {
 	var fixturesHelper testfixtures.Helper = &testfixtures.SQLite{}
 	// If set, use the config we provided instead of normal
 	if os.Getenv("VIKUNJA_TESTS_USE_CONFIG") == "1" {
-		config.InitConfig()
-		err = SetEngine()
+		x, err = db.CreateTestEngine()
 		if err != nil {
-			return err
+			return fmt.Errorf("error getting test engine: %v", err)
 		}
 
 		err = initSchema(x)