broken cross-tq-can test

Author: carlydf

tests/versioning_3_test.go

@@ -75,7 +75,7 @@ func NewVersioning3Suite(useV32 bool) *Versioning3Suite {
 func TestVersioning3FunctionalSuite(t *testing.T) {
 	t.Parallel()
 	suite.Run(t, NewVersioning3Suite(true))
-	//suite.Run(t, NewVersioning3Suite(false))
+	// suite.Run(t, NewVersioning3Suite(false))
 }
 
 func (s *Versioning3Suite) SetupSuite() {
@@ -1510,23 +1510,31 @@ func (s *Versioning3Suite) testChildWorkflowInheritance_ExpectNoInherit(crossTq
 	s.verifyWorkflowVersioning(tv2Child, vbPinned, tv2Child.Deployment(), nil, nil)
 }
 
-func (s *Versioning3Suite) TestPinnedCaN() {
-	s.testCan(vbPinned)
+func (s *Versioning3Suite) TestPinnedCaN_SameTQ() {
+	s.testCan(false, vbPinned, true)
 }
 
-func (s *Versioning3Suite) TestUnpinnedCaN() {
-	s.testCan(vbUnpinned)
+func (s *Versioning3Suite) TestPinnedCaN_CrossTQ_Inherit() {
+	s.testCan(false, vbPinned, true)
+}
+
+func (s *Versioning3Suite) TestPinnedCaN_CrossTQ_NoInherit() {
+	s.testCan(false, vbPinned, false)
 }
 
-func (s *Versioning3Suite) testCan(behavior enumspb.VersioningBehavior) {
-	// CaN inherits version if pinned, goes to current version if unpinned.
+func (s *Versioning3Suite) TestUnpinnedCaN() {
+	s.testCan(false, vbUnpinned, false)
+}
 
+func (s *Versioning3Suite) testCan(crossTq bool, behavior enumspb.VersioningBehavior, expectInherit bool) {
+	// CaN inherits version if pinned and if new task queue is in pinned version, goes to current version if unpinned.
 	tv1 := testvars.New(s).WithBuildIDNumber(1).WithWorkflowIDNumber(1)
 	tv2 := tv1.WithBuildIDNumber(2)
 	sdkBehavior := workflow.VersioningBehaviorAutoUpgrade
 	if behavior == vbPinned {
 		sdkBehavior = workflow.VersioningBehaviorPinned
 	}
+	canxTq := tv1.TaskQueue().GetName() + "_XTQ_CaN"
 
 	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
 	defer cancel()
@@ -1537,18 +1545,16 @@ func (s *Versioning3Suite) testCan(behavior enumspb.VersioningBehavior) {
 	wf1 := func(ctx workflow.Context, attempt int) (string, error) {
 		switch attempt {
 		case 0:
-			//if crossTq {
-			//	newCtx = workflow.WithWorkflowTaskQueue(newCtx, canxTq)
-			//}
+			newCtx := ctx
+			if crossTq {
+				newCtx = workflow.WithWorkflowTaskQueue(newCtx, canxTq)
+			}
 			s.verifyWorkflowVersioning(tv1, vbUnspecified, nil, nil, tv1.DeploymentVersionTransition())
 			wfStarted <- struct{}{}
 			// wait for current version to change.
 			<-currentChanged
-			return "", workflow.NewContinueAsNewError(ctx, "wf", attempt+1)
+			return "", workflow.NewContinueAsNewError(newCtx, "wf", attempt+1)
 		case 1:
-			//if crossTq {
-			//	newCtx = workflow.WithWorkflowTaskQueue(newCtx, canxTq)
-			//}
 			s.verifyWorkflowVersioning(tv1, vbPinned, tv1.Deployment(), nil, nil)
 			return "v1", nil
 		}
@@ -1566,6 +1572,19 @@ func (s *Versioning3Suite) testCan(behavior enumspb.VersioningBehavior) {
 	})
 	s.NoError(err)
 
+	if crossTq && expectInherit {
+		w1xtq := worker.New(sdkClient, canxTq, worker.Options{
+			DeploymentOptions: worker.DeploymentOptions{
+				Version:                   tv1.DeploymentVersionString(),
+				UseVersioning:             true,
+				DefaultVersioningBehavior: workflow.VersioningBehaviorAutoUpgrade,
+			},
+			MaxConcurrentWorkflowTaskPollers: numPollers,
+		})
+		w1xtq.RegisterWorkflowWithOptions(wf1, workflow.RegisterOptions{Name: "wf", VersioningBehavior: workflow.VersioningBehaviorPinned})
+		s.NoError(w1xtq.Start())
+		defer w1xtq.Stop()
+	}
 	w1 := worker.New(sdkClient, tv1.TaskQueue().GetName(), worker.Options{
 		DeploymentOptions: worker.DeploymentOptions{
 			UseVersioning:             true,
@@ -1612,7 +1631,7 @@ func (s *Versioning3Suite) testCan(behavior enumspb.VersioningBehavior) {
 
 	var out string
 	s.NoError(run.Get(ctx, &out))
-	if behavior == enumspb.VERSIONING_BEHAVIOR_PINNED {
+	if behavior == enumspb.VERSIONING_BEHAVIOR_PINNED && expectInherit {
 		s.Equal("v1", out)
 	} else {
 		s.Equal("v2", out)