From 25e8927279a04903c820889fc433e11e06009dc9 Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Tue, 6 May 2025 14:54:04 +0800 Subject: [PATCH] Minor test updates --- .github/workflows/streaming-jakarta.yaml | 2 +- .github/workflows/streaming.yaml | 2 +- coherence/processors/processors.go | 3 +-- test/e2e/perf/suite_test.go | 3 ++- test/e2e/queues/queues_test.go | 7 +------ test/e2e/streaming/streaming_test.go | 4 +--- 6 files changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/streaming-jakarta.yaml b/.github/workflows/streaming-jakarta.yaml index 1a42720..05ec77d 100644 --- a/.github/workflows/streaming-jakarta.yaml +++ b/.github/workflows/streaming-jakarta.yaml @@ -65,7 +65,7 @@ jobs: with: go-version: '${{ matrix.go-version }}' - - name: Verify Examples + - name: Verify shell: bash run: | go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 diff --git a/.github/workflows/streaming.yaml b/.github/workflows/streaming.yaml index 370ac41..a9a36ae 100644 --- a/.github/workflows/streaming.yaml +++ b/.github/workflows/streaming.yaml @@ -66,7 +66,7 @@ jobs: with: go-version: '${{ matrix.go-version }}' - - name: Verify Examples + - name: Verify shell: bash run: | go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 diff --git a/coherence/processors/processors.go b/coherence/processors/processors.go index bbae06c..43aab71 100644 --- a/coherence/processors/processors.go +++ b/coherence/processors/processors.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2024 Oracle and/or its affiliates. + * Copyright (c) 2022, 2025 Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ @@ -15,7 +15,6 @@ import ( const ( processorPrefix = "processor." extractorPrefix = "extractor." - queuePrefix = "internal.net.queue.processor." compositeProcessorType = processorPrefix + "CompositeProcessor" conditionalProcessorType = processorPrefix + "ConditionalProcessor" diff --git a/test/e2e/perf/suite_test.go b/test/e2e/perf/suite_test.go index 27944cd..eb07c4e 100644 --- a/test/e2e/perf/suite_test.go +++ b/test/e2e/perf/suite_test.go @@ -155,7 +155,8 @@ func InitializeCoherence(ctx context.Context, address string) (Config, error) { ) // create a new Session to the default gRPC port of 1408 using plain text - config.Session, err = coherence.NewSession(ctx, coherence.WithPlainText(), coherence.WithAddress(address)) + config.Session, err = coherence.NewSession(ctx, coherence.WithPlainText(), coherence.WithAddress(address), + coherence.WithRequestTimeout(300*time.Minute)) if err != nil { return config, err } diff --git a/test/e2e/queues/queues_test.go b/test/e2e/queues/queues_test.go index 185a417..93cf978 100644 --- a/test/e2e/queues/queues_test.go +++ b/test/e2e/queues/queues_test.go @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Oracle and/or its affiliates. + * Copyright (c) 2024, 2025 Oracle and/or its affiliates. * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. */ @@ -455,11 +455,6 @@ func runTestQueueCompatability(g *gomega.WithT, queueName string, firstQueueType g.Expect(queue.Destroy(ctx)).ShouldNot(gomega.HaveOccurred()) utils.Sleep(5) - - //g.Expect(errorOccurred).To(gomega.Equal(shouldError)) - //if !shouldError { - // g.Expect(queue.Destroy(ctx)).ShouldNot(gomega.HaveOccurred()) - //} } func testQueue(ctx context.Context, g *gomega.WithT, queue coherence.NamedQueue[string]) { diff --git a/test/e2e/streaming/streaming_test.go b/test/e2e/streaming/streaming_test.go index 58bff54..f7c7a02 100644 --- a/test/e2e/streaming/streaming_test.go +++ b/test/e2e/streaming/streaming_test.go @@ -48,8 +48,6 @@ var ( func TestStreamingConcurrency(t *testing.T) { g := gomega.NewWithT(t) - _ = os.Setenv("COHERENCE_CLIENT_REQUEST_TIMEOUT", "300000") - osCacheCount := os.Getenv("COHERENCE_CACHE_COUNT") if os.Getenv(osCacheCount) != "" { v, err := strconv.Atoi(osCacheCount) @@ -58,7 +56,7 @@ func TestStreamingConcurrency(t *testing.T) { } } - session, err := utils.GetSession() + session, err := utils.GetSession(coherence.WithRequestTimeout(5 * time.Minute)) g.Expect(err).ShouldNot(gomega.HaveOccurred()) defer session.Close()