Fix printHistory util and remove abusing in tests (cadence-workflow#1824

)
code-4-fun · May 9, 2019 · a33c480 · a33c480
1 parent 189ecbc
commit a33c480
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 67 deletions.
diff --git a/common/util.go b/common/util.go
@@ -22,6 +22,7 @@ package common
 
 import (
 	"encoding/json"
+	"fmt"
 	"math/rand"
 	"sync"
 	"time"
@@ -256,9 +257,9 @@ func PrettyPrintHistory(history *workflow.History, logger log.Logger) {
 		logger.Error("Error serializing history: %v\n", tag.Error(err))
 	}
 
-	logger.Info("******************************************")
-	logger.Info("History", tag.DetailInfo(string(data)))
-	logger.Info("******************************************")
+	fmt.Println("******************************************")
+	fmt.Println("History", tag.DetailInfo(string(data)))
+	fmt.Println("******************************************")
 }
 
 // IsValidContext checks that the thrift context is not expired on cancelled.

diff --git a/host/activity_test.go b/host/activity_test.go
@@ -494,10 +494,6 @@ func (s *integrationSuite) TestActivityRetry() {
 		}
 	}
 
-	s.printWorkflowHistory(s.domainName, &workflow.WorkflowExecution{
-		WorkflowId: common.StringPtr(id),
-		RunId:      common.StringPtr(we.GetRunId()),
-	})
 	s.True(workflowComplete)
 	s.True(activityExecutedCount == 2)
 }
@@ -836,10 +832,6 @@ func (s *integrationSuite) TestActivityTimeouts() {
 		}
 	}
 
-	s.printWorkflowHistory(s.domainName, &workflow.WorkflowExecution{
-		WorkflowId: common.StringPtr(id),
-		RunId:      common.StringPtr(we.GetRunId()),
-	})
 	s.True(workflowComplete)
 }
 
@@ -1024,10 +1016,6 @@ func (s *integrationSuite) TestActivityHeartbeatTimeouts() {
 		}
 	}
 
-	s.printWorkflowHistory(s.domainName, &workflow.WorkflowExecution{
-		WorkflowId: common.StringPtr(id),
-		RunId:      common.StringPtr(we.GetRunId()),
-	})
 	s.True(workflowComplete)
 	s.False(failWorkflow, failReason)
 	s.Equal(activityCount, activitiesTimedout)
@@ -1286,9 +1274,4 @@ func (s *integrationSuite) TestActivityCancellationNotStarted() {
 	requestCancellation = false
 	_, err = poller.PollAndProcessDecisionTask(false, false)
 	s.True(err == nil || err == matching.ErrNoTasks)
-
-	s.printWorkflowHistory(s.domainName, &workflow.WorkflowExecution{
-		WorkflowId: common.StringPtr(id),
-		RunId:      common.StringPtr(we.GetRunId()),
-	})
 }
diff --git a/host/cancelworkflow_test.go b/host/cancelworkflow_test.go
@@ -153,7 +153,6 @@ GetHistoryLoop:
 		})
 		s.Nil(err)
 		history := historyResponse.History
-		common.PrettyPrintHistory(history, s.Logger)
 
 		lastEvent := history.Events[len(history.Events)-1]
 		if *lastEvent.EventType != workflow.EventTypeWorkflowExecutionCanceled {
@@ -337,7 +336,6 @@ CheckHistoryLoopForCancelSent:
 		})
 		s.Nil(err)
 		history := historyResponse.History
-		common.PrettyPrintHistory(history, s.Logger)
 
 		lastEvent := history.Events[len(history.Events)-2]
 		if *lastEvent.EventType != workflow.EventTypeExternalWorkflowExecutionCancelRequested {
@@ -374,7 +372,6 @@ GetHistoryLoop:
 		})
 		s.Nil(err)
 		history := historyResponse.History
-		common.PrettyPrintHistory(history, s.Logger)
 
 		lastEvent := history.Events[len(history.Events)-1]
 		if *lastEvent.EventType != workflow.EventTypeWorkflowExecutionCanceled {
@@ -507,7 +504,6 @@ CheckHistoryLoopForCancelSent:
 		})
 		s.Nil(err)
 		history := historyResponse.History
-		common.PrettyPrintHistory(history, s.Logger)
 
 		lastEvent := history.Events[len(history.Events)-2]
 		if *lastEvent.EventType != workflow.EventTypeRequestCancelExternalWorkflowExecutionFailed {

diff --git a/host/continueasnew_test.go b/host/continueasnew_test.go
@@ -215,7 +215,6 @@ GetHistoryLoop:
 		})
 		s.Nil(err)
 		history := historyResponse.History
-		common.PrettyPrintHistory(history, s.Logger)
 
 		lastEvent := history.Events[len(history.Events)-1]
 		if *lastEvent.EventType != workflow.EventTypeWorkflowExecutionTimedOut {
@@ -479,12 +478,4 @@ func (s *integrationSuite) TestChildWorkflowWithContinueAsNew() {
 	s.Equal([]byte("Child Done."), completedAttributes.Result)
 
 	s.Logger.Info("Parent Workflow Execution History: ")
-	s.printWorkflowHistory(s.domainName, &workflow.WorkflowExecution{
-		WorkflowId: common.StringPtr(parentID),
-		RunId:      common.StringPtr(*we.RunId),
-	})
-
-	s.Logger.Info("Child Workflow Execution History: ")
-	s.printWorkflowHistory(s.domainName,
-		startedEvent.ChildWorkflowExecutionStartedEventAttributes.WorkflowExecution)
 }
diff --git a/host/integration_test.go b/host/integration_test.go
@@ -226,7 +226,6 @@ GetHistoryLoop:
 		})
 		s.Nil(err)
 		history := historyResponse.History
-		common.PrettyPrintHistory(history, s.Logger)
 
 		lastEvent := history.Events[len(history.Events)-1]
 		if *lastEvent.EventType != workflow.EventTypeWorkflowExecutionTerminated {
@@ -1175,8 +1174,6 @@ func (s *integrationSuite) TestRateLimitBufferedEvents() {
 	s.Logger.Info("PollAndProcessDecisionTask", tag.Error(err))
 	s.Nil(err)
 
-	s.printWorkflowHistory(s.domainName, workflowExecution)
-
 	s.True(workflowComplete)
 	s.Equal(101, signalCount) // check that all 101 signals are received.
 }
@@ -1736,14 +1733,6 @@ func (s *integrationSuite) TestChildWorkflowExecution() {
 	s.Equal([]byte("Child Done."), completedAttributes.Result)
 
 	s.Logger.Info("Parent Workflow Execution History: ")
-	s.printWorkflowHistory(s.domainName, &workflow.WorkflowExecution{
-		WorkflowId: common.StringPtr(parentID),
-		RunId:      common.StringPtr(*we.RunId),
-	})
-
-	s.Logger.Info("Child Workflow Execution History: ")
-	s.printWorkflowHistory(s.domainName,
-		startedEvent.ChildWorkflowExecutionStartedEventAttributes.WorkflowExecution)
 }
 
 func (s *integrationSuite) TestCronChildWorkflowExecution() {
@@ -1997,7 +1986,6 @@ GetHistoryLoop:
 		})
 		s.Nil(err)
 		history := historyResponse.History
-		common.PrettyPrintHistory(history, s.Logger)
 
 		lastEvent := history.Events[len(history.Events)-1]
 		if *lastEvent.EventType != workflow.EventTypeWorkflowExecutionTimedOut {
@@ -2215,8 +2203,6 @@ func (s *integrationSuite) TestDecisionTaskFailed() {
 	s.True(workflowComplete)
 	s.Equal(16, signalCount)
 
-	s.printWorkflowHistory(s.domainName, workflowExecution)
-
 	events := s.getHistory(s.domainName, workflowExecution)
 	var lastEvent *workflow.HistoryEvent
 	var lastDecisionStartedEvent *workflow.HistoryEvent
@@ -2455,12 +2441,6 @@ func (s *integrationSuite) TestTransientDecisionTimeout() {
 	s.Logger.Info("PollAndProcessDecisionTask", tag.Error(err))
 	s.Nil(err)
 
-	// Print history after dropping decision
-	s.printWorkflowHistory(s.domainName, &workflow.WorkflowExecution{
-		WorkflowId: common.StringPtr(id),
-		RunId:      common.StringPtr(we.GetRunId()),
-	})
-
 	// Now process signal and complete workflow execution
 	_, err = poller.PollAndProcessDecisionTaskWithAttempt(true, false, false, false, int64(1))
 	s.Logger.Info("PollAndProcessDecisionTask", tag.Error(err))
@@ -2649,7 +2629,6 @@ func (s *integrationSuite) TestRelayDecisionTimeout() {
 	}
 	// verify relay decision task timeout
 	s.True(decisionTaskTimeout)
-	s.printWorkflowHistory(s.domainName, workflowExecution)
 
 	// Now complete workflow
 	_, err = poller.PollAndProcessDecisionTaskWithAttempt(true, false, false, false, int64(1))
@@ -2772,8 +2751,6 @@ func (s *integrationSuite) TestTaskProcessingProtectionForRateLimitError() {
 	s.Logger.Info("pollAndProcessDecisionTask", tag.Error(err))
 	s.Nil(err)
 
-	s.printWorkflowHistory(s.domainName, workflowExecution)
-
 	s.True(workflowComplete)
 	s.Equal(102, signalCount)
 }
@@ -2950,7 +2927,6 @@ WaitForStickyTimeoutLoop:
 	}
 	s.True(workflowComplete, "Workflow not complete")
 	s.Equal(2, failedDecisions, "Mismatched failed decision count")
-	s.printWorkflowHistory(s.domainName, workflowExecution)
 }
 
 func (s *integrationSuite) TestStickyTasklistResetThenTimeout() {
@@ -3119,7 +3095,6 @@ WaitForStickyTimeoutLoop:
 	}
 	s.True(workflowComplete, "Workflow not complete")
 	s.Equal(2, failedDecisions, "Mismatched failed decision count")
-	s.printWorkflowHistory(s.domainName, workflowExecution)
 }
 
 func (s *integrationSuite) TestBufferedEventsOutOfOrder() {
@@ -3269,8 +3244,6 @@ func (s *integrationSuite) TestBufferedEventsOutOfOrder() {
 	s.Equal(scheduleEvent.GetEventId(), completedEvent.ActivityTaskCompletedEventAttributes.GetScheduledEventId())
 	s.Equal(startedEvent.GetEventId(), completedEvent.ActivityTaskCompletedEventAttributes.GetStartedEventId())
 	s.True(workflowComplete)
-
-	s.printWorkflowHistory(s.domainName, workflowExecution)
 }
 
 type startFunc func() (*workflow.StartWorkflowExecutionResponse, error)

diff --git a/host/signalworkflow_test.go b/host/signalworkflow_test.go
@@ -553,7 +553,7 @@ CheckHistoryLoopForSignalSent:
 		})
 		s.Nil(err)
 		history := historyResponse.History
-		common.PrettyPrintHistory(history, s.Logger)
+		//common.PrettyPrintHistory(history, s.Logger)
 
 		signalRequestedEvent := history.Events[len(history.Events)-2]
 		if *signalRequestedEvent.EventType != workflow.EventTypeExternalWorkflowExecutionSignaled {
@@ -771,7 +771,6 @@ CheckHistoryLoopForSignalSent:
 		})
 		s.Nil(err)
 		history := historyResponse.History
-		common.PrettyPrintHistory(history, s.Logger)
 
 		signalRequestedEvent := history.Events[len(history.Events)-2]
 		if *signalRequestedEvent.EventType != workflow.EventTypeExternalWorkflowExecutionSignaled {
@@ -911,7 +910,6 @@ CheckHistoryLoopForCancelSent:
 		})
 		s.Nil(err)
 		history := historyResponse.History
-		common.PrettyPrintHistory(history, s.Logger)
 
 		signalFailedEvent := history.Events[len(history.Events)-2]
 		if *signalFailedEvent.EventType != workflow.EventTypeSignalExternalWorkflowExecutionFailed {
@@ -1039,7 +1037,6 @@ CheckHistoryLoopForCancelSent:
 		})
 		s.Nil(err)
 		history := historyResponse.History
-		common.PrettyPrintHistory(history, s.Logger)
 
 		signalFailedEvent := history.Events[len(history.Events)-2]
 		if *signalFailedEvent.EventType != workflow.EventTypeSignalExternalWorkflowExecutionFailed {

diff --git a/hostxdc/integration_domain_failover_test.go b/hostxdc/integration_domain_failover_test.go
@@ -1674,7 +1674,6 @@ func (s *integrationClustersTestSuite) TestActivityHeartbeatFailover() {
 	})
 	s.Nil(err)
 	history := historyResponse.History
-	common.PrettyPrintHistory(history, s.logger)
 
 	activityRetryFound := false
 	for _, event := range history.Events {

diff --git a/service/history/timerBuilder_test.go b/service/history/timerBuilder_test.go
@@ -226,8 +226,6 @@ func (s *timerBuilderProcessorSuite) TestDecodeHistory() {
 
 	history := &workflow.History{}
 	history.Events = historyEvents
-
-	common.PrettyPrintHistory(history, s.logger)
 }
 
 func (s *timerBuilderProcessorSuite) TestDecodeKey() {