From d50685ea2d512c839a9e3bcab8bd6762f2850533 Mon Sep 17 00:00:00 2001 From: Matt Toohey Date: Thu, 10 Oct 2024 16:59:10 +1100 Subject: [PATCH] fix integration tests --- backend/controller/admin/local_client_test.go | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/backend/controller/admin/local_client_test.go b/backend/controller/admin/local_client_test.go index 224babcf6..0ae7a266a 100644 --- a/backend/controller/admin/local_client_test.go +++ b/backend/controller/admin/local_client_test.go @@ -4,6 +4,7 @@ package admin import ( "context" + "net/url" "testing" "github.com/alecthomas/assert/v2" @@ -16,8 +17,22 @@ import ( "github.com/TBD54566975/ftl/internal/configuration/routers" in "github.com/TBD54566975/ftl/internal/integration" "github.com/TBD54566975/ftl/internal/log" + "github.com/TBD54566975/ftl/internal/schema" ) +func getDiskSchema(t testing.TB, ctx context.Context) *schema.Schema { + t.Helper() + + bindURL, err := url.Parse("http://127.0.0.1:8893") + assert.NoError(t, err) + bindAllocator, err := bind.NewBindAllocator(bindURL) + assert.NoError(t, err) + dsr := &diskSchemaRetriever{} + sch, err := dsr.GetActiveSchema(ctx, optional.Some(bindAllocator)) + assert.Error(t, err) + return sch +} + func TestDiskSchemaRetrieverWithBuildArtefact(t *testing.T) { in.Run(t, in.WithFTLConfig("ftl-project-dr.toml"), @@ -25,9 +40,7 @@ func TestDiskSchemaRetrieverWithBuildArtefact(t *testing.T) { in.CopyModule("dischema"), in.Build("dischema"), func(t testing.TB, ic in.TestContext) { - dsr := &diskSchemaRetriever{deployRoot: optional.Some[string](ic.WorkingDir())} - sch, err := dsr.GetActiveSchema(ic.Context, optional.None[*bind.BindAllocator]()) - assert.NoError(t, err) + sch := getDiskSchema(t, ic.Context) module, ok := sch.Module("dischema").Get() assert.Equal(t, ok, true) @@ -42,9 +55,7 @@ func TestDiskSchemaRetrieverWithNoSchema(t *testing.T) { in.WithoutController(), in.CopyModule("dischema"), func(t testing.TB, ic in.TestContext) { - dsr := &diskSchemaRetriever{} - _, err := dsr.GetActiveSchema(ic.Context, optional.None[*bind.BindAllocator]()) - assert.Error(t, err) + _ = getDiskSchema(t, ic.Context) }, ) }