pages/pages-server
1
0
Fork 0
mirror of https://codeberg.org/Codeberg/pages-server.git synced 2025-04-24 13:56:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use zerolog for integrationtests too

Browse source
This commit is contained in:
6543 2022-06-10 19:47:52 +02:00
parent de9c37d72b
commit 50df84eec9
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
integration/get_test.go
View file

@ -4,16 +4,16 @@ import (
"bytes"
"crypto/tls"
"io"
"log"
"net/http"
"net/http/cookiejar"
"testing"
"github.com/rs/zerolog/log"
"github.com/stretchr/testify/assert"
)
func TestGetRedirect(t *testing.T) {
log.Println("== TestGetRedirect ==")
log.Printf("== TestGetRedirect ==\n")
// test custom domain redirect
resp, err := getTestHTTPSClient().Get("https://calciumdibromid.localhost.mock.directory:4430")
assert.NoError(t, err)
@ -25,7 +25,7 @@ func TestGetRedirect(t *testing.T) {
}
func TestGetContent(t *testing.T) {
log.Println("== TestGetContent ==")
log.Printf("== TestGetContent ==\n")
// test get image
resp, err := getTestHTTPSClient().Get("https://magiclike.localhost.mock.directory:4430/images/827679288a.jpg")
assert.NoError(t, err)

11
integration/main_test.go
View file

@ -2,24 +2,25 @@ package integration
import (
"context"
"log"
"os"
"testing"
"time"
"codeberg.org/codeberg/pages/cmd"
"github.com/rs/zerolog/log"
"github.com/urfave/cli/v2"
)
func TestMain(m *testing.M) {
log.Println("=== TestMain: START Server ==")
log.Printf("=== TestMain: START Server ==\n")
serverCtx, serverCancel := context.WithCancel(context.Background())
if err := startServer(serverCtx); err != nil {
log.Fatalf("could not start server: %v", err)
log.Fatal().Msgf("could not start server: %v", err)
}
defer func() {
serverCancel()
log.Println("=== TestMain: Server STOPED ==")
log.Printf("=== TestMain: Server STOPED ==\n")
}()
time.Sleep(30 * time.Second)
@ -46,7 +47,7 @@ func startServer(ctx context.Context) error {
go func() {
if err := app.RunContext(ctx, args); err != nil {
log.Fatalf("run server error: %v", err)
log.Fatal().Msgf("run server error: %v", err)
}
}()