mirror of https://git.sr.ht/~ashkeel/strimertul
chore: fix tests
This commit is contained in:
parent
019e558b22
commit
decccb9fed
|
@ -162,7 +162,6 @@ func TestLocalDBClientGetJSON(t *testing.T) {
|
||||||
A string
|
A string
|
||||||
B int
|
B int
|
||||||
}
|
}
|
||||||
|
|
||||||
testStruct := test{
|
testStruct := test{
|
||||||
A: "test",
|
A: "test",
|
||||||
B: 42,
|
B: 42,
|
||||||
|
|
|
@ -69,7 +69,6 @@ func NewManager(ctx context.Context, db database.Database, server *webserver.Web
|
||||||
}
|
}
|
||||||
|
|
||||||
// New client works, replace old
|
// New client works, replace old
|
||||||
updatedClient.Merge(manager.client)
|
|
||||||
manager.client = updatedClient
|
manager.client = updatedClient
|
||||||
|
|
||||||
logger.Info("Reloaded/updated Twitch integration")
|
logger.Info("Reloaded/updated Twitch integration")
|
||||||
|
@ -104,19 +103,6 @@ type Client struct {
|
||||||
streamOnline *sync.RWSync[bool]
|
streamOnline *sync.RWSync[bool]
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Client) Merge(old *Client) {
|
|
||||||
// Copy bot instance and some params
|
|
||||||
c.streamOnline.Set(old.streamOnline.Get())
|
|
||||||
c.ensureRoute()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Hacky function to deal with sync issues when restarting client
|
|
||||||
func (c *Client) ensureRoute() {
|
|
||||||
if c.Config.Get().Enabled {
|
|
||||||
c.server.RegisterRoute(twitch.CallbackRoute, c)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func newClient(ctx context.Context, config twitch.Config, db database.Database, server *webserver.WebServer) (*Client, error) {
|
func newClient(ctx context.Context, config twitch.Config, db database.Database, server *webserver.WebServer) (*Client, error) {
|
||||||
// Create Twitch client
|
// Create Twitch client
|
||||||
client := &Client{
|
client := &Client{
|
||||||
|
|
|
@ -14,7 +14,7 @@ func TestNewClient(t *testing.T) {
|
||||||
client, _ := database.CreateInMemoryLocalClient(t)
|
client, _ := database.CreateInMemoryLocalClient(t)
|
||||||
defer database.CleanupLocalClient(client)
|
defer database.CleanupLocalClient(client)
|
||||||
|
|
||||||
server, err := webserver.NewServer(client, webserver.DefaultServerFactory)
|
server, err := webserver.NewServer(context.Background(), client, webserver.DefaultServerFactory)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package webserver
|
package webserver
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
|
@ -15,7 +16,7 @@ func TestNewServer(t *testing.T) {
|
||||||
client, _ := database.CreateInMemoryLocalClient(t)
|
client, _ := database.CreateInMemoryLocalClient(t)
|
||||||
defer database.CleanupLocalClient(client)
|
defer database.CleanupLocalClient(client)
|
||||||
|
|
||||||
_, err := NewServer(client, DefaultServerFactory)
|
_, err := NewServer(context.Background(), client, DefaultServerFactory)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -26,7 +27,7 @@ func TestNewServerWithTestFactory(t *testing.T) {
|
||||||
defer database.CleanupLocalClient(client)
|
defer database.CleanupLocalClient(client)
|
||||||
|
|
||||||
testServer := NewTestServer()
|
testServer := NewTestServer()
|
||||||
_, err := NewServer(client, testServer.Factory())
|
_, err := NewServer(context.Background(), client, testServer.Factory())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -38,7 +39,7 @@ func TestListen(t *testing.T) {
|
||||||
|
|
||||||
// Create a test server
|
// Create a test server
|
||||||
testServer := NewTestServer()
|
testServer := NewTestServer()
|
||||||
server, err := NewServer(client, testServer.Factory())
|
server, err := NewServer(context.Background(), client, testServer.Factory())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
@ -95,7 +96,7 @@ func TestCustomRoute(t *testing.T) {
|
||||||
defer database.CleanupLocalClient(client)
|
defer database.CleanupLocalClient(client)
|
||||||
|
|
||||||
// Create test server
|
// Create test server
|
||||||
server, err := NewServer(client, nil)
|
server, err := NewServer(context.Background(), client, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue