use channels for sync

This commit is contained in:
Matthew R Kasun
2023-02-14 07:01:38 -05:00
parent c3e253fb79
commit 82cac8fa30
11 changed files with 46 additions and 43 deletions

View File

@@ -3,7 +3,6 @@ package controller
import (
"testing"
"github.com/gravitl/netmaker/database"
"github.com/gravitl/netmaker/logic"
"github.com/gravitl/netmaker/models"
"github.com/stretchr/testify/assert"
@@ -18,7 +17,7 @@ func deleteAllUsers() {
func TestHasAdmin(t *testing.T) {
//delete all current users
database.InitializeDatabase()
initialize()
users, _ := logic.GetUsers()
for _, user := range users {
success, err := logic.DeleteUser(user.UserName)
@@ -48,7 +47,7 @@ func TestHasAdmin(t *testing.T) {
})
t.Run("multiple admins", func(t *testing.T) {
var user = models.User{"admin1", "password", nil, true, nil}
err := logic.CreateUser(&user)
err := logic.CreateUser(&user)
assert.Nil(t, err)
found, err := logic.HasAdmin()
assert.Nil(t, err)
@@ -57,7 +56,7 @@ func TestHasAdmin(t *testing.T) {
}
func TestCreateUser(t *testing.T) {
database.InitializeDatabase()
initialize()
deleteAllUsers()
user := models.User{"admin", "password", nil, true, nil}
t.Run("NoUser", func(t *testing.T) {
@@ -72,7 +71,7 @@ func TestCreateUser(t *testing.T) {
}
func TestCreateAdmin(t *testing.T) {
database.InitializeDatabase()
initialize()
deleteAllUsers()
var user models.User
t.Run("NoAdmin", func(t *testing.T) {
@@ -90,7 +89,7 @@ func TestCreateAdmin(t *testing.T) {
}
func TestDeleteUser(t *testing.T) {
database.InitializeDatabase()
initialize()
deleteAllUsers()
t.Run("NonExistent User", func(t *testing.T) {
deleted, err := logic.DeleteUser("admin")
@@ -107,7 +106,7 @@ func TestDeleteUser(t *testing.T) {
}
func TestValidateUser(t *testing.T) {
database.InitializeDatabase()
initialize()
var user models.User
t.Run("Valid Create", func(t *testing.T) {
user.UserName = "admin"
@@ -155,7 +154,7 @@ func TestValidateUser(t *testing.T) {
}
func TestGetUser(t *testing.T) {
database.InitializeDatabase()
initialize()
deleteAllUsers()
t.Run("NonExistantUser", func(t *testing.T) {
admin, err := logic.GetUser("admin")
@@ -172,7 +171,7 @@ func TestGetUser(t *testing.T) {
}
func TestGetUsers(t *testing.T) {
database.InitializeDatabase()
initialize()
deleteAllUsers()
t.Run("NonExistantUser", func(t *testing.T) {
admin, err := logic.GetUsers()
@@ -203,7 +202,7 @@ func TestGetUsers(t *testing.T) {
}
func TestUpdateUser(t *testing.T) {
database.InitializeDatabase()
initialize()
deleteAllUsers()
user := models.User{"admin", "password", nil, true, nil}
newuser := models.User{"hello", "world", []string{"wirecat, netmaker"}, true, []string{}}
@@ -246,7 +245,7 @@ func TestUpdateUser(t *testing.T) {
// }
func TestVerifyAuthRequest(t *testing.T) {
database.InitializeDatabase()
initialize()
deleteAllUsers()
var authRequest models.UserAuthParams
t.Run("EmptyUserName", func(t *testing.T) {