Ver Fonte

fixed tests write to DB directly

Tobias Cudnik há 2 anos atrás
pai
commit
cd7707f9c2
2 ficheiros alterados com 8 adições e 3 exclusões
  1. 4 1
      controllers/network_test.go
  2. 4 2
      controllers/node_test.go

+ 4 - 1
controllers/network_test.go

@@ -215,7 +215,10 @@ func TestIpv6Network(t *testing.T) {
 
 
 func deleteAllNetworks() {
 func deleteAllNetworks() {
 	deleteAllNodes()
 	deleteAllNodes()
-	database.DeleteAllRecords(database.NETWORKS_TABLE_NAME)
+	nets, _ := logic.GetNetworks()
+	for _, n := range nets {
+		logic.DeleteNetwork(n.NetID)
+	}
 }
 }
 
 
 func createNet() {
 func createNet() {

+ 4 - 2
controllers/node_test.go

@@ -5,7 +5,6 @@ import (
 	"testing"
 	"testing"
 
 
 	"github.com/google/uuid"
 	"github.com/google/uuid"
-	"github.com/gravitl/netmaker/database"
 	"github.com/gravitl/netmaker/logic"
 	"github.com/gravitl/netmaker/logic"
 	"github.com/gravitl/netmaker/logic/acls"
 	"github.com/gravitl/netmaker/logic/acls"
 	"github.com/gravitl/netmaker/logic/acls/nodeacls"
 	"github.com/gravitl/netmaker/logic/acls/nodeacls"
@@ -217,7 +216,10 @@ func TestNodeACLs(t *testing.T) {
 }
 }
 
 
 func deleteAllNodes() {
 func deleteAllNodes() {
-	database.DeleteAllRecords(database.NODES_TABLE_NAME)
+	nodes, _ := logic.GetAllNodes()
+	for _, n := range nodes {
+		logic.DeleteNode(&n, true)
+	}
 }
 }
 
 
 func createTestNode() *models.Node {
 func createTestNode() *models.Node {