jacob-mathison/query-orchestration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merged in feature/parallellogqueries (pull request #132)

Browse Source 
Testing Tweaks

* parallel

* slowestquery

* split

* cleanup

* health

* dynamiccores

* go

* profile

* timeout

* commitmychanges

* taskfile

* sqlcheckstart

* client

* cost

* ctxtimeout
This commit is contained in:
Michael McGuinness
2025-05-05 09:31:21 +00:00
parent 40061ee2e9
commit efe87321b2
76 changed files with 1238 additions and 1495 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/test/ecosystem.go
+29 -30
View File
@@ -107,7 +107,7 @@ type Dependencies struct {
}
func CreateFullDependencies(t testing.TB, ctx context.Context, cfg FullDependenciesConfig) (Dependencies, func()) {
network := GetNetwork(t, ctx)
network := GetNetwork(t)
deps := Dependencies{
Network: network,
@@ -119,33 +119,32 @@ func CreateFullDependencies(t testing.TB, ctx context.Context, cfg FullDependenc
wg.Add(1)
go func() {
mockServer, cleanMock := CreateMockServer(t, ctx, network)
deps.MockServer = mockServer
cs["mock"] = cleanMock
deps.AWSConfig = CreateAWSContainer(t, cfg, network)
SetQueueClient(t, ctx, cfg, deps.AWSConfig.ExternalEndpoint)
for _, runner := range runners {
wg.Add(1)
go func() {
deps.QueueURLs[runner.Name] = CreateQueue(t, ctx, cfg, runner.Name)
wg.Done()
}()
}
SetStoreClient(t, ctx, cfg, deps.AWSConfig.ExternalEndpoint)
CreateBucket(t, ctx, cfg)
SetBucketNotifs(t, ctx, cfg)
wg.Done()
}()
wg.Add(1)
go func() {
deps.DBConfig = CreateDB(t, ctx, cfg, network, &CreateDatabaseConfig{})
wg.Done()
}()
mockServer, cleanMock := CreateMockServer(t, ctx, network)
deps.MockServer = mockServer
cs["mock"] = cleanMock
deps.AWSConfig = CreateAWSContainer(t, ctx, cfg, network)
SetQueueClient(t, ctx, cfg, deps.AWSConfig.ExternalEndpoint)
for _, runner := range runners {
wg.Add(1)
go func() {
deps.QueueURLs[runner.Name] = CreateQueue(t, ctx, cfg, runner.Name)
wg.Done()
}()
}
SetStoreClient(t, ctx, cfg, deps.AWSConfig.ExternalEndpoint)
CreateBucket(t, ctx, cfg)
SetBucketNotifs(t, ctx, cfg)
CreateDB(t, cfg, network, &CreateDatabaseConfig{
NoMigrations: true,
})
wg.Wait()
@@ -211,7 +210,7 @@ type MockExpectation struct {
}
func CreateMockServer(t testing.TB, ctx context.Context, network string) (MockServer, func()) {
name := NormaliseAlias(fmt.Sprintf("mockserver_%s", t.Name()))
name := GetAlias(t, "mockserver")
port, err := nat.NewPort("tcp", "1080")
require.NoError(t, err)
@@ -258,11 +257,13 @@ func CreateMockServer(t testing.TB, ctx context.Context, network string) (MockSe
}
}
func NormaliseAlias(fullName string) string {
name := strings.ToLower(fullName)
func GetAlias(t testing.TB, baseName string) string {
name := fmt.Sprintf("%s_%s", baseName, t.Name())
name = strings.ToLower(name)
name = strings.ReplaceAll(name, "/", "")
name = strings.ReplaceAll(name, " ", "")
name = strings.ReplaceAll(name, "-", "")
name = strings.ReplaceAll(name, "_", "")
return name
}
@@ -348,9 +349,7 @@ func WaitForMockEndpoint(t testing.TB, server MockServer, request MockRequest) M
verifyURL := fmt.Sprintf("%s/mockserver/verify", server.External)
clientTimeout := 500 * time.Millisecond
client := &http.Client{
Timeout: clientTimeout,
}
client := &http.Client{}
timeout := time.After(60 * time.Second)
ticker := time.NewTicker(clientTimeout)