From 172e516427c31b80bb3156e4d6edc07ca089d888 Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Wed, 16 Nov 2022 16:33:19 +0100 Subject: [PATCH] fix e2e generate test --- rpc/client/helpers.go | 2 +- test/e2e/generator/generate_test.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rpc/client/helpers.go b/rpc/client/helpers.go index 4f9e83e69..8014d875a 100644 --- a/rpc/client/helpers.go +++ b/rpc/client/helpers.go @@ -69,7 +69,7 @@ func WaitForOneEvent(c EventsClient, evtTyp string, timeout time.Duration) (type } // make sure to unregister after the test is over defer func() { - if deferErr := c.UnsubscribeAll(context.Background(), subscriber); deferErr != nil { + if deferErr := c.UnsubscribeAll(ctx, subscriber); deferErr != nil { panic(deferErr) } }() diff --git a/test/e2e/generator/generate_test.go b/test/e2e/generator/generate_test.go index c60fadd1e..2affedb11 100644 --- a/test/e2e/generator/generate_test.go +++ b/test/e2e/generator/generate_test.go @@ -15,11 +15,12 @@ import ( func TestGenerator(t *testing.T) { manifests, err := Generate(rand.New(rand.NewSource(randomSeed))) require.NoError(t, err) - require.True(t, len(manifests) >= 24, "insufficient combinations %d", len(manifests)) for idx, m := range manifests { t.Run(fmt.Sprintf("Case%04d", idx), func(t *testing.T) { - _, err := e2e.NewTestnetFromManifest(m, filepath.Join(t.TempDir(), fmt.Sprintf("Case%04d", idx)), e2e.InfrastructureData{}) + infra, err := e2e.NewDockerInfrastructureData(m) + require.NoError(t, err) + _, err = e2e.NewTestnetFromManifest(m, filepath.Join(t.TempDir(), fmt.Sprintf("Case%04d", idx)), infra) require.NoError(t, err) }) }