Skip to content

Commit 38fe879

Browse files
authoredJun 12, 2024··
Always run all the versioning tests (#1510)
1 parent a7c8208 commit 38fe879

File tree

4 files changed

+2
-46
lines changed

4 files changed

+2
-46
lines changed
 

‎.github/workflows/ci.yml

-2
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ jobs:
8888
if: ${{ matrix.testDockerCompose }}
8989
run: go run . integration-test
9090
working-directory: ./internal/cmd/build
91-
env:
92-
RUN_VERSIONING_V2_TESTS: "true"
9391

9492
cloud-test:
9593
strategy:

‎client/client.go

+1
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,7 @@ type (
742742
// When not supported by the server, it returns an empty [TaskQueueDescription] if there is no information
743743
// about the task queue, or an error when the response identifies an unsupported server.
744744
// Note that using a sticky queue as target is not supported.
745+
// Also, workflow reachability status is eventually consistent, and it could take a few minutes to update.
745746
// WARNING: Worker versioning is currently experimental, and requires server 1.24+
746747
DescribeTaskQueueEnhanced(ctx context.Context, options DescribeTaskQueueEnhancedOptions) (TaskQueueDescription, error)
747748

‎internal/client.go

+1
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ type (
359359
// When not supported by the server, it returns an empty [TaskQueueDescription] if there is no information
360360
// about the task queue, or an error when the response identifies an unsupported server.
361361
// Note that using a sticky queue as target is not supported.
362+
// Also, workflow reachability status is eventually consistent, and it could take a few minutes to update.
362363
// WARNING: Worker versioning is currently experimental, and requires server 1.24+
363364
DescribeTaskQueueEnhanced(ctx context.Context, options DescribeTaskQueueEnhancedOptions) (TaskQueueDescription, error)
364365

‎test/worker_versioning_test.go

-44
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ package test_test
2424

2525
import (
2626
"context"
27-
"os"
2827
"testing"
2928
"time"
3029

@@ -39,13 +38,6 @@ import (
3938
"go.temporal.io/sdk/worker"
4039
)
4140

42-
var runNewVersioningTests bool
43-
44-
func init() {
45-
run, ok := os.LookupEnv("RUN_VERSIONING_V2_TESTS")
46-
runNewVersioningTests = ok && run != ""
47-
}
48-
4941
type WorkerVersioningTestSuite struct {
5042
*require.Assertions
5143
suite.Suite
@@ -111,10 +103,6 @@ func (ts *WorkerVersioningTestSuite) TestManipulateVersionSets() {
111103
}
112104

113105
func (ts *WorkerVersioningTestSuite) TestManipulateRules() {
114-
if !runNewVersioningTests {
115-
ts.T().Skip("temporal cli devserver does not support new versioning API yet.")
116-
}
117-
118106
ctx, cancel := context.WithTimeout(context.Background(), ctxTimeout)
119107
defer cancel()
120108

@@ -181,10 +169,6 @@ func (ts *WorkerVersioningTestSuite) TestManipulateRules() {
181169
}
182170

183171
func (ts *WorkerVersioningTestSuite) TestReplaceDeleteRules() {
184-
if !runNewVersioningTests {
185-
ts.T().Skip("temporal cli devserver does not support new versioning API yet.")
186-
}
187-
188172
ctx, cancel := context.WithTimeout(context.Background(), ctxTimeout)
189173
defer cancel()
190174

@@ -277,10 +261,6 @@ func (ts *WorkerVersioningTestSuite) TestReplaceDeleteRules() {
277261
}
278262

279263
func (ts *WorkerVersioningTestSuite) TestCommitRules() {
280-
if !runNewVersioningTests {
281-
ts.T().Skip("temporal cli devserver does not support new versioning API yet.")
282-
}
283-
284264
ctx, cancel := context.WithTimeout(context.Background(), ctxTimeout)
285265
defer cancel()
286266

@@ -354,10 +334,6 @@ func (ts *WorkerVersioningTestSuite) TestCommitRules() {
354334
}
355335

356336
func (ts *WorkerVersioningTestSuite) TestConflictTokens() {
357-
if !runNewVersioningTests {
358-
ts.T().Skip("temporal cli devserver does not support new versioning API yet.")
359-
}
360-
361337
ctx, cancel := context.WithTimeout(context.Background(), ctxTimeout)
362338
defer cancel()
363339

@@ -467,10 +443,6 @@ func (ts *WorkerVersioningTestSuite) TestTwoWorkersGetDifferentTasks() {
467443
}
468444

469445
func (ts *WorkerVersioningTestSuite) TestTwoWorkersGetDifferentTasksWithRules() {
470-
if !runNewVersioningTests {
471-
ts.T().Skip("temporal cli devserver does not support new versioning API yet.")
472-
}
473-
474446
ctx, cancel := context.WithTimeout(context.Background(), ctxTimeout)
475447
defer cancel()
476448

@@ -558,10 +530,6 @@ func (ts *WorkerVersioningTestSuite) TestReachabilityUnreachable() {
558530
}
559531

560532
func (ts *WorkerVersioningTestSuite) TestReachabilityUnreachableWithRules() {
561-
if !runNewVersioningTests {
562-
ts.T().Skip("temporal cli devserver does not support new versioning API yet.")
563-
}
564-
565533
ctx, cancel := context.WithTimeout(context.Background(), ctxTimeout)
566534
defer cancel()
567535

@@ -624,10 +592,6 @@ func (ts *WorkerVersioningTestSuite) TestReachabilityUnversionedWorker() {
624592
}
625593

626594
func (ts *WorkerVersioningTestSuite) TestReachabilityUnversionedWorkerWithRules() {
627-
if !runNewVersioningTests {
628-
ts.T().Skip("temporal cli devserver does not support new versioning API yet.")
629-
}
630-
631595
ctx, cancel := context.WithTimeout(context.Background(), ctxTimeout)
632596
defer cancel()
633597

@@ -745,10 +709,6 @@ func (ts *WorkerVersioningTestSuite) TestReachabilityVersions() {
745709
}
746710

747711
func (ts *WorkerVersioningTestSuite) TestReachabilityVersionsWithRules() {
748-
if !runNewVersioningTests {
749-
ts.T().Skip("temporal cli devserver does not support new versioning API yet.")
750-
}
751-
752712
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
753713
defer cancel()
754714

@@ -913,10 +873,6 @@ func (ts *WorkerVersioningTestSuite) TestBuildIDChangesOverWorkflowLifetime() {
913873
}
914874

915875
func (ts *WorkerVersioningTestSuite) TestBuildIDChangesOverWorkflowLifetimeWithRules() {
916-
if !runNewVersioningTests {
917-
ts.T().Skip("temporal cli devserver does not support new versioning API yet.")
918-
}
919-
920876
ctx, cancel := context.WithTimeout(context.Background(), ctxTimeout)
921877
defer cancel()
922878

0 commit comments

Comments
 (0)
Please sign in to comment.