mirror of
https://github.com/btouchard/ackify-ce.git
synced 2026-02-28 10:48:47 -06:00
fix: github actions tests runs
This commit is contained in:
@@ -15,7 +15,7 @@ jobs:
|
||||
postgres:
|
||||
image: postgres:16-alpine
|
||||
env:
|
||||
POSTGRES_USER: ackify
|
||||
POSTGRES_USER: postgres
|
||||
POSTGRES_PASSWORD: testpassword
|
||||
POSTGRES_DB: ackify_test
|
||||
options: >-
|
||||
@@ -62,7 +62,7 @@ jobs:
|
||||
|
||||
- name: Run database migrations
|
||||
env:
|
||||
ACKIFY_DB_DSN: "postgres://ackify:testpassword@localhost:5432/ackify_test?sslmode=disable"
|
||||
ACKIFY_DB_DSN: "postgres://postgres:testpassword@localhost:5432/ackify_test?sslmode=disable"
|
||||
run: |
|
||||
go run ./backend/cmd/migrate/main.go -migrations-path file://backend/migrations up
|
||||
|
||||
@@ -77,14 +77,14 @@ jobs:
|
||||
|
||||
- name: Start Ackify server
|
||||
env:
|
||||
ACKIFY_DB_DSN: "postgres://ackify:testpassword@localhost:5432/ackify_test?sslmode=disable"
|
||||
ACKIFY_DB_DSN: "postgres://postgres:testpassword@localhost:5432/ackify_test?sslmode=disable"
|
||||
ACKIFY_BASE_URL: "http://localhost:8080"
|
||||
ACKIFY_ORGANISATION: "Ackify Test"
|
||||
ACKIFY_OAUTH_PROVIDER: "github"
|
||||
ACKIFY_OAUTH_CLIENT_ID: "test_client_id"
|
||||
ACKIFY_OAUTH_CLIENT_SECRET: "test_client_secret"
|
||||
ACKIFY_OAUTH_COOKIE_SECRET: "dGVzdF9jb29raWVfc2VjcmV0X2Zvcl90ZXN0aW5nXzEyMzQ1Njc4OTA="
|
||||
ACKIFY_ED25519_PRIVATE_KEY: "dGVzdF9wcml2YXRlX2tleV9mb3JfdGVzdGluZ19vbmx5XzEyMzQ1Njc4OTA="
|
||||
ACKIFY_ED25519_PRIVATE_KEY: "kKjNo0cTUOdXcamyxYCcmGfUm7zXzeI8T2jaLEjvbcpA0IIO7HbR3ANBlUlqlWuV3D+RjDT+8p5o37n98+Wu5A=="
|
||||
ACKIFY_LISTEN_ADDR: ":8080"
|
||||
ACKIFY_ADMIN_EMAILS: "admin@test.com"
|
||||
ACKIFY_MAIL_HOST: "localhost"
|
||||
|
||||
@@ -7,6 +7,7 @@ RELEASE_*.md
|
||||
.idea
|
||||
.env
|
||||
.env.local
|
||||
scripts/
|
||||
|
||||
.gocache/
|
||||
codecov.yml
|
||||
|
||||
@@ -5,6 +5,7 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
@@ -366,10 +367,10 @@ func TestSessionWorker_GracefulShutdown(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestSessionWorker_ContextCancellation(t *testing.T) {
|
||||
cleanupCalled := false
|
||||
var cleanupCalled atomic.Bool
|
||||
repo := &mockSessionRepoForWorker{
|
||||
deleteExpiredFn: func(ctx context.Context, olderThan time.Duration) (int64, error) {
|
||||
cleanupCalled = true
|
||||
cleanupCalled.Store(true)
|
||||
// Check if context is cancelled during cleanup
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
@@ -395,7 +396,7 @@ func TestSessionWorker_ContextCancellation(t *testing.T) {
|
||||
// Wait for immediate cleanup
|
||||
time.Sleep(50 * time.Millisecond)
|
||||
|
||||
if !cleanupCalled {
|
||||
if !cleanupCalled.Load() {
|
||||
t.Error("Cleanup should have been called")
|
||||
}
|
||||
|
||||
|
||||
+9
-9
@@ -25,21 +25,21 @@ services:
|
||||
ACKIFY_LOG_LEVEL: "debug"
|
||||
ACKIFY_LOG_FORMAT: "classic"
|
||||
ACKIFY_BASE_URL: "http://localhost:8080"
|
||||
ACKIFY_ORGANISATION: "Superkloud"
|
||||
ACKIFY_ORGANISATION: "Ackify Test"
|
||||
ACKIFY_DB_DSN: "postgres://postgres:testpassword@ackify-db:5432/ackify_test?sslmode=disable"
|
||||
ACKIFY_OAUTH_PROVIDER: "none"
|
||||
ACKIFY_OAUTH_COOKIE_SECRET: "Fk7eiBaG0sOhGn5+nWB6Ipl7TqbGfeLSdhwrEKjOPPM="
|
||||
ACKIFY_AUTH_OAUTH_ENABLED: "true"
|
||||
ACKIFY_AUTH_MAGICLINK_ENABLED: "true"
|
||||
ACKIFY_ED25519_PRIVATE_KEY: "1aK7vTp7hiqM9Z3Xbj7QDfPlYyWy740l9Fu+Fdom5ck="
|
||||
ACKIFY_OAUTH_PROVIDER: "github"
|
||||
ACKIFY_OAUTH_CLIENT_ID: "test_client_id"
|
||||
ACKIFY_OAUTH_CLIENT_SECRET: "test_client_secret"
|
||||
ACKIFY_OAUTH_COOKIE_SECRET: "dGVzdF9jb29raWVfc2VjcmV0X2Zvcl90ZXN0aW5nXzEyMzQ1Njc4OTA="
|
||||
ACKIFY_ED25519_PRIVATE_KEY: "kKjNo0cTUOdXcamyxYCcmGfUm7zXzeI8T2jaLEjvbcpA0IIO7HbR3ANBlUlqlWuV3D+RjDT+8p5o37n98+Wu5A=="
|
||||
ACKIFY_LISTEN_ADDR: ":8080"
|
||||
ACKIFY_ADMIN_EMAILS: "benjamin@kolapsis.com"
|
||||
ACKIFY_ADMIN_EMAILS: "admin@test.com"
|
||||
ACKIFY_MAIL_HOST: "mailhog"
|
||||
ACKIFY_MAIL_PORT: "1025"
|
||||
ACKIFY_MAIL_TLS: "false"
|
||||
ACKIFY_MAIL_STARTTLS: "false"
|
||||
ACKIFY_MAIL_FROM: "noreply@ackify.local"
|
||||
ACKIFY_MAIL_FROM_NAME: "Ackify"
|
||||
ACKIFY_MAIL_FROM: "noreply@ackify.test"
|
||||
ACKIFY_MAIL_FROM_NAME: "Ackify Test"
|
||||
depends_on:
|
||||
ackify-migrate:
|
||||
condition: service_completed_successfully
|
||||
|
||||
Reference in New Issue
Block a user