diff --git a/conduit/pipeline/pipeline.go b/conduit/pipeline/pipeline.go index e26b4250..c294956f 100644 --- a/conduit/pipeline/pipeline.go +++ b/conduit/pipeline/pipeline.go @@ -62,7 +62,7 @@ type pipelineImpl struct { } var ( - errStopCause = errors.New("pipeline stopped") + stopCause = errors.New("pipeline stopped") //nolint:revive // this is a sentinel error errImporterCause = errors.New("importer cancelled") errProcessorCause = errors.New("processor cancelled") errExporterCause = errors.New("exporter cancelled") @@ -386,7 +386,7 @@ func (p *pipelineImpl) Init() error { } func (p *pipelineImpl) Stop() { - p.ccf(errStopCause) + p.ccf(stopCause) p.wg.Wait() if p.profFile != nil { diff --git a/e2e_tests/src/e2e_conduit/subslurp.py b/e2e_tests/src/e2e_conduit/subslurp.py index ed5e134f..23fc12b5 100644 --- a/e2e_tests/src/e2e_conduit/subslurp.py +++ b/e2e_tests/src/e2e_conduit/subslurp.py @@ -7,10 +7,8 @@ logger = logging.getLogger(__name__) # Matches conduit log output: -# "FINISHED Pipeline round: 110. UPDATED Pipeline round: 111" -FINISH_ROUND: re.Pattern = re.compile( - b"FINISHED Pipeline round: (\d+). UPDATED Pipeline round" -) +# "UPDATED Pipeline NextRound=111. FINISHED Pipeline round r=110 (23 txn) exported in 1.23435sec" +FINISH_ROUND: re.Pattern = re.compile(b"FINISHED Pipeline round r=(\d+)") class subslurp: